[Jboss-svn-commits] JBL Code SVN: r4721 - in labs/jbossweb/trunk/src/share: classes/org/apache/catalina/servlets/php native/php5servlet

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-06-10 18:28:06 -0400 (Sat, 10 Jun 2006)
New Revision: 4721

Modified:
   labs/jbossweb/trunk/src/share/classes/org/apache/catalina/servlets/php/Handler.java
   labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.c
Log:
Comment the log method. It is unused for now.

Modified: labs/jbossweb/trunk/src/share/classes/org/apache/catalina/servlets/php/Handler.java
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/catalina/servlets/php/Handler.java	2006-06-10 19:37:45 UTC (rev 4720)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/catalina/servlets/php/Handler.java	2006-06-10 22:28:06 UTC (rev 4721)
@@ -211,5 +211,9 @@
             res.setStatus(HttpServletResponse.SC_NOT_FOUND);
         }
     }
-
+    
+    public static void log(Handler handler, String msg)
+    {
+        // TODO: Log the message    
+    }
 }

Modified: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.c
===================================================================
--- labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.c	2006-06-10 19:37:45 UTC (rev 4720)
+++ labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.c	2006-06-10 22:28:06 UTC (rev 4721)
@@ -522,10 +522,12 @@
 
     (*e)->CallStaticVoidMethod(e, jni_SAPI_class,
                                jni_SAPI_methods[5].m,
+                               r->res,
                                SG(sapi_headers).http_response_code);
     SG(headers_sent) = 1;
     if ((*e)->CallStaticIntMethod(e, jni_SAPI_class,
-                                  jni_SAPI_methods[3].m) < 0) {
+                                  jni_SAPI_methods[3].m,
+                                  r->res) < 0) {
         php_handle_aborted_connection();
     }
 }
@@ -544,11 +546,13 @@
         return;
     }
     e = r->e;
-
+    /*
+     * TODO: Log the message
     (*e)->CallStaticVoidMethod(e, jni_SAPI_class,
                                jni_SAPI_methods[2].m,
                                r->handler,
                                STR_TO_JSTRING(msg));
+    */
 }