rasmus          Tue Mar 18 22:23:22 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/sapi/aolserver     aolserver.c 
    /php-src/sapi/apache2filter sapi_apache2.c 
    /php-src/sapi/apache2handler        sapi_apache2.c 
    /php-src/sapi/apache_hooks  mod_php5.c 
    /php-src/sapi/caudium       caudium.c 
    /php-src/sapi/cgi   cgi_main.c 
    /php-src/sapi/cli   php_cli.c 
    /php-src/sapi/continuity    capi.c 
    /php-src/sapi/embed php_embed.c 
    /php-src/sapi/isapi php5isapi.c 
    /php-src/sapi/milter        php_milter.c 
    /php-src/sapi/nsapi nsapi.c 
    /php-src/sapi/phttpd        phttpd.c 
    /php-src/sapi/pi3web        pi3web_sapi.c 
    /php-src/sapi/roxen roxen.c 
    /php-src/sapi/thttpd        thttpd.c 
    /php-src/sapi/tux   php_tux.c 
    /php-src/sapi/webjames      webjames.c 
  Log:
  Add new empty child terminate sapi hook to the rest of the sapis
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.81.2.2.2.1.2.2&r2=1.81.2.2.2.1.2.3&diff_format=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.2 
php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.3
--- php-src/sapi/aolserver/aolserver.c:1.81.2.2.2.1.2.2 Mon Dec 31 07:17:17 2007
+++ php-src/sapi/aolserver/aolserver.c  Tue Mar 18 22:23:20 2008
@@ -22,7 +22,7 @@
  * - CGI/1.1 conformance
  */
 
-/* $Id: aolserver.c,v 1.81.2.2.2.1.2.2 2007/12/31 07:17:17 sebastian Exp $ */
+/* $Id: aolserver.c,v 1.81.2.2.2.1.2.3 2008/03/18 22:23:20 rasmus Exp $ */
 
 /* conflict between PHP and AOLserver headers */
 #define Debug php_Debug
@@ -205,7 +205,7 @@
        int i;
        
        php_info_print_table_start();
-       php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 
1.81.2.2.2.1.2.2 2007/12/31 07:17:17 sebastian Exp $");
+       php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 
1.81.2.2.2.1.2.3 2008/03/18 22:23:20 rasmus Exp $");
        php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
        php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
        php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -386,6 +386,7 @@
        php_ns_sapi_register_variables,
        NULL,                                                                   
/* Log message */
        NULL,                                                                   
/* Get request time */
+       NULL,                                                   /* child 
terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.136.2.2.2.8.2.1&r2=1.136.2.2.2.8.2.2&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.1 
php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.2
--- php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.1 Mon Dec 31 
07:17:18 2007
+++ php-src/sapi/apache2filter/sapi_apache2.c   Tue Mar 18 22:23:20 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.136.2.2.2.8.2.1 2007/12/31 07:17:18 sebastian Exp $ 
*/
+/* $Id: sapi_apache2.c,v 1.136.2.2.2.8.2.2 2008/03/18 22:23:20 rasmus Exp $ */
 
 #include <fcntl.h>
 
@@ -335,6 +335,7 @@
        php_apache_sapi_register_variables,
        php_apache_sapi_log_message,                    /* Log message */
        php_apache_sapi_get_request_time,               /* Get Request Time */
+       NULL,                                           /* Child terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.15.2.2&r2=1.57.2.10.2.15.2.3&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.2 
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.3
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.15.2.2       Wed Jan 
16 15:49:46 2008
+++ php-src/sapi/apache2handler/sapi_apache2.c  Tue Mar 18 22:23:20 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.15.2.2 2008/01/16 15:49:46 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.15.2.3 2008/03/18 22:23:20 rasmus Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -343,6 +343,7 @@
        php_apache_sapi_register_variables,
        php_apache_sapi_log_message,                    /* Log message */
        php_apache_sapi_get_request_time,               /* Request Time */
+       NULL,                                           /* Child Terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/mod_php5.c?r1=1.11.2.1.2.5.2.2&r2=1.11.2.1.2.5.2.3&diff_format=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.5.2.2 
php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.5.2.3
--- php-src/sapi/apache_hooks/mod_php5.c:1.11.2.1.2.5.2.2       Sun Mar 16 
21:06:54 2008
+++ php-src/sapi/apache_hooks/mod_php5.c        Tue Mar 18 22:23:20 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                       
                  |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.11.2.1.2.5.2.2 2008/03/16 21:06:54 helly Exp $ */
+/* $Id: mod_php5.c,v 1.11.2.1.2.5.2.3 2008/03/18 22:23:20 rasmus Exp $ */
 
 #include "php_apache_http.h"
 
@@ -524,6 +524,7 @@
        sapi_apache_register_server_variables,          /* register server 
variables */
        php_apache_log_message,                 /* Log message */
        NULL,                                                   /* Get request 
time */
+       NULL,                                   /* child terminate */
 
        NULL,                                                   /* php.ini path 
override */
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/caudium/caudium.c?r1=1.36.2.1.2.1.2.1&r2=1.36.2.1.2.1.2.2&diff_format=u
Index: php-src/sapi/caudium/caudium.c
diff -u php-src/sapi/caudium/caudium.c:1.36.2.1.2.1.2.1 
php-src/sapi/caudium/caudium.c:1.36.2.1.2.1.2.2
--- php-src/sapi/caudium/caudium.c:1.36.2.1.2.1.2.1     Mon Dec 31 07:17:18 2007
+++ php-src/sapi/caudium/caudium.c      Tue Mar 18 22:23:20 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: caudium.c,v 1.36.2.1.2.1.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: caudium.c,v 1.36.2.1.2.1.2.2 2008/03/18 22:23:20 rasmus Exp $ */
 
 #include "php.h"
 #ifdef HAVE_CAUDIUM
@@ -444,7 +444,7 @@
 {
   /*  char buf[512]; */
   php_info_print_table_start();
-  php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 
1.36.2.1.2.1.2.1 2007/12/31 07:17:18 sebastian Exp $");
+  php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 
1.36.2.1.2.1.2.2 2008/03/18 22:23:20 rasmus Exp $");
   /*  php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
       php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
       php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -551,6 +551,7 @@
   sapi_caudium_register_variables,     /* register server variables */
   NULL,                                        /* Log message */
   NULL,                                        /* Get request time */
+  NULL,                                        /* Child terminate */
 
   STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.15&r2=1.267.2.15.2.50.2.16&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.15 
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.16
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.15    Tue Mar 18 08:36:27 2008
+++ php-src/sapi/cgi/cgi_main.c Tue Mar 18 22:23:20 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.15 2008/03/18 08:36:27 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.16 2008/03/18 22:23:20 rasmus Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -808,6 +808,7 @@
        sapi_cgi_register_variables,    /* register server variables */
        sapi_cgi_log_message,                   /* Log message */
        NULL,                                                   /* Get request 
time */
+       NULL,                                                   /* Child 
terminate */   
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.22.2.6&r2=1.129.2.13.2.22.2.7&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.6 
php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.7
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.22.2.6      Tue Mar 18 08:36:27 2008
+++ php-src/sapi/cli/php_cli.c  Tue Mar 18 22:23:21 2008
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.129.2.13.2.22.2.6 2008/03/18 08:36:27 dmitry Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.22.2.7 2008/03/18 22:23:21 rasmus Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -408,6 +408,7 @@
        sapi_cli_register_variables,    /* register server variables */
        sapi_cli_log_message,                   /* Log message */
        NULL,                                                   /* Get request 
time */
+       NULL,                                                   /* Child 
terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/continuity/capi.c?r1=1.11.2.2.2.1.2.2&r2=1.11.2.2.2.1.2.3&diff_format=u
Index: php-src/sapi/continuity/capi.c
diff -u php-src/sapi/continuity/capi.c:1.11.2.2.2.1.2.2 
php-src/sapi/continuity/capi.c:1.11.2.2.2.1.2.3
--- php-src/sapi/continuity/capi.c:1.11.2.2.2.1.2.2     Mon Dec 31 07:17:18 2007
+++ php-src/sapi/continuity/capi.c      Tue Mar 18 22:23:21 2008
@@ -110,7 +110,7 @@
 PHP_MINFO_FUNCTION(continuity)
 {
         php_info_print_table_start();
-        php_info_print_table_row(2, "Continuity Module Revision", "$Revision: 
1.11.2.2.2.1.2.2 $");
+        php_info_print_table_row(2, "Continuity Module Revision", "$Revision: 
1.11.2.2.2.1.2.3 $");
         php_info_print_table_row(2, "Server Version", conFget_build());
 #ifdef CONTINUITY_CDPEXT
        php_info_print_table_row(2,"CDP Extensions", "enabled");
@@ -378,7 +378,8 @@
 
    sapi_capi_register_server_variables,        /* register server variables */
    capi_log_message,           /* Log message */
-   NULL,                                       /* Get request time */
+   NULL,                       /* Get request time */
+   NULL,                       / Child terminate */
 
    NULL,                       /* Block interruptions */
    NULL,                       /* Unblock interruptions */
http://cvs.php.net/viewvc.cgi/php-src/sapi/embed/php_embed.c?r1=1.11.2.1.2.5.2.1&r2=1.11.2.1.2.5.2.2&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.11.2.1.2.5.2.1 
php-src/sapi/embed/php_embed.c:1.11.2.1.2.5.2.2
--- php-src/sapi/embed/php_embed.c:1.11.2.1.2.5.2.1     Mon Dec 31 07:17:18 2007
+++ php-src/sapi/embed/php_embed.c      Tue Mar 18 22:23:21 2008
@@ -15,7 +15,7 @@
    | Author: Edin Kadribasic <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
 */
-/* $Id: php_embed.c,v 1.11.2.1.2.5.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: php_embed.c,v 1.11.2.1.2.5.2.2 2008/03/18 22:23:21 rasmus Exp $ */
 
 #include "php_embed.h"
 
@@ -134,6 +134,7 @@
        php_embed_register_variables,   /* register server variables */
        php_embed_log_message,          /* Log message */
        NULL,                                                   /* Get request 
time */
+       NULL,                                                   /* Child 
terminate */
   
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/php5isapi.c?r1=1.8.2.2.2.3.2.1&r2=1.8.2.2.2.3.2.2&diff_format=u
Index: php-src/sapi/isapi/php5isapi.c
diff -u php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.1 
php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.2
--- php-src/sapi/isapi/php5isapi.c:1.8.2.2.2.3.2.1      Mon Dec 31 07:17:18 2007
+++ php-src/sapi/isapi/php5isapi.c      Tue Mar 18 22:23:21 2008
@@ -16,7 +16,7 @@
    |          Ben Mansell <[EMAIL PROTECTED]> (Zeus Support)                   
|
    +----------------------------------------------------------------------+
  */
-/* $Id: php5isapi.c,v 1.8.2.2.2.3.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: php5isapi.c,v 1.8.2.2.2.3.2.2 2008/03/18 22:23:21 rasmus Exp $ */
 
 #include "php.h"
 #include <httpext.h>
@@ -688,6 +688,7 @@
        sapi_isapi_register_server_variables,   /* register server variables */
        NULL,                                                   /* Log message 
*/
        NULL,                                                   /* Get request 
time */
+       NULL,                                                   /* Child 
terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/milter/php_milter.c?r1=1.14.2.2.2.3.2.3&r2=1.14.2.2.2.3.2.4&diff_format=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.3 
php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.4
--- php-src/sapi/milter/php_milter.c:1.14.2.2.2.3.2.3   Tue Mar 18 08:36:27 2008
+++ php-src/sapi/milter/php_milter.c    Tue Mar 18 22:23:21 2008
@@ -869,6 +869,7 @@
        sapi_milter_register_variables, /* register server variables */
        NULL,                                                   /* Log message 
*/
        NULL,                                                   /* Get request 
time */
+       NULL,                                                   /* Child 
terminate */
 
        NULL,                                                   /* Block 
interruptions */
        NULL,                                                   /* Unblock 
interruptions */
http://cvs.php.net/viewvc.cgi/php-src/sapi/nsapi/nsapi.c?r1=1.69.2.3.2.6.2.3&r2=1.69.2.3.2.6.2.4&diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.3 
php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.4
--- php-src/sapi/nsapi/nsapi.c:1.69.2.3.2.6.2.3 Sun Mar  9 16:07:14 2008
+++ php-src/sapi/nsapi/nsapi.c  Tue Mar 18 22:23:21 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: nsapi.c,v 1.69.2.3.2.6.2.3 2008/03/09 16:07:14 felipe Exp $ */
+/* $Id: nsapi.c,v 1.69.2.3.2.6.2.4 2008/03/18 22:23:21 rasmus Exp $ */
 
 /*
  * PHP includes
@@ -308,7 +308,7 @@
 PHP_MINFO_FUNCTION(nsapi)
 {
        php_info_print_table_start();
-       php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 
1.69.2.3.2.6.2.3 $");
+       php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 
1.69.2.3.2.6.2.4 $");
        php_info_print_table_row(2, "Server Software", system_version());
        php_info_print_table_row(2, "Sub-requests with nsapi_virtual()",
         (nsapi_servact_service)?((zend_ini_long("zlib.output_compression", 
sizeof("zlib.output_compression"), 0))?"not supported with 
zlib.output_compression":"enabled"):"not supported on this platform" );
@@ -757,6 +757,7 @@
        sapi_nsapi_register_server_variables,   /* register server variables */
        nsapi_log_message,                      /* Log message */
        sapi_nsapi_get_request_time,                    /* Get request time */
+       NULL,                                                                   
/* Child terminate */
 
        NULL,                                   /* Block interruptions */
        NULL,                                   /* Unblock interruptions */
http://cvs.php.net/viewvc.cgi/php-src/sapi/phttpd/phttpd.c?r1=1.41.2.1.2.1.2.1&r2=1.41.2.1.2.1.2.2&diff_format=u
Index: php-src/sapi/phttpd/phttpd.c
diff -u php-src/sapi/phttpd/phttpd.c:1.41.2.1.2.1.2.1 
php-src/sapi/phttpd/phttpd.c:1.41.2.1.2.1.2.2
--- php-src/sapi/phttpd/phttpd.c:1.41.2.1.2.1.2.1       Mon Dec 31 07:17:18 2007
+++ php-src/sapi/phttpd/phttpd.c        Tue Mar 18 22:23:21 2008
@@ -180,6 +180,7 @@
        NULL,                                                                   
/* register server variables */
        NULL,                                                                   
/* Log message */
        NULL,                                                                   
/* Get request time */
+       NULL,                                                                   
/* Child terminate */
 
     STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/pi3web/pi3web_sapi.c?r1=1.60.2.1.2.1.2.1&r2=1.60.2.1.2.1.2.2&diff_format=u
Index: php-src/sapi/pi3web/pi3web_sapi.c
diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.60.2.1.2.1.2.1 
php-src/sapi/pi3web/pi3web_sapi.c:1.60.2.1.2.1.2.2
--- php-src/sapi/pi3web/pi3web_sapi.c:1.60.2.1.2.1.2.1  Mon Dec 31 07:17:18 2007
+++ php-src/sapi/pi3web/pi3web_sapi.c   Tue Mar 18 22:23:21 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: pi3web_sapi.c,v 1.60.2.1.2.1.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: pi3web_sapi.c,v 1.60.2.1.2.1.2.2 2008/03/18 22:23:21 rasmus Exp $ */
 
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
 
@@ -57,7 +57,7 @@
        PUTS("<table border=0 cellpadding=3 cellspacing=1 width=600 
align=center>\n");
        PUTS("<tr><th colspan=2 bgcolor=\"" PHP_HEADER_COLOR "\">Pi3Web Server 
Information</th></tr>\n");
        php_info_print_table_header(2, "Information Field", "Value");
-       php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: 
pi3web_sapi.c,v 1.60.2.1.2.1.2.1 2007/12/31 07:17:18 sebastian Exp $");
+       php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: 
pi3web_sapi.c,v 1.60.2.1.2.1.2.2 2008/03/18 22:23:21 rasmus Exp $");
        php_info_print_table_row(2, "Server Name Stamp", 
HTTPCore_getServerStamp());
        snprintf(variable_buf, 511, "%d", HTTPCore_debugEnabled());
        php_info_print_table_row(2, "Debug Enabled", variable_buf);
@@ -337,6 +337,7 @@
        sapi_pi3web_register_variables, /* register server variables */
        NULL,                                   /* Log message */
        NULL,                                   /* Get request time */
+       NULL,                                   /* Child terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/roxen/roxen.c?r1=1.61.2.2.2.1.2.1&r2=1.61.2.2.2.1.2.2&diff_format=u
Index: php-src/sapi/roxen/roxen.c
diff -u php-src/sapi/roxen/roxen.c:1.61.2.2.2.1.2.1 
php-src/sapi/roxen/roxen.c:1.61.2.2.2.1.2.2
--- php-src/sapi/roxen/roxen.c:1.61.2.2.2.1.2.1 Mon Dec 31 07:17:18 2007
+++ php-src/sapi/roxen/roxen.c  Tue Mar 18 22:23:21 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: roxen.c,v 1.61.2.2.2.1.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: roxen.c,v 1.61.2.2.2.1.2.2 2008/03/18 22:23:21 rasmus Exp $ */
 
 #include "php.h"
 #ifdef HAVE_ROXEN
@@ -438,7 +438,7 @@
 {
   /*  char buf[512]; */
   php_info_print_table_start();
-  php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 
1.61.2.2.2.1.2.1 2007/12/31 07:17:18 sebastian Exp $");
+  php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 
1.61.2.2.2.1.2.2 2008/03/18 22:23:21 rasmus Exp $");
   /*  php_info_print_table_row(2, "Build date", Ns_InfoBuildDate());
       php_info_print_table_row(2, "Config file path", Ns_InfoConfigFile());
       php_info_print_table_row(2, "Error Log path", Ns_InfoErrorLog());
@@ -502,6 +502,7 @@
   NULL,                                        /* register server variables */
   NULL,                                        /* Log message */
   NULL,                                        /* Get request time */
+  NULL,                                        /* Child terminate */
 
   STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/thttpd/thttpd.c?r1=1.95.2.1.2.1.2.1&r2=1.95.2.1.2.1.2.2&diff_format=u
Index: php-src/sapi/thttpd/thttpd.c
diff -u php-src/sapi/thttpd/thttpd.c:1.95.2.1.2.1.2.1 
php-src/sapi/thttpd/thttpd.c:1.95.2.1.2.1.2.2
--- php-src/sapi/thttpd/thttpd.c:1.95.2.1.2.1.2.1       Mon Dec 31 07:17:18 2007
+++ php-src/sapi/thttpd/thttpd.c        Tue Mar 18 22:23:21 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: thttpd.c,v 1.95.2.1.2.1.2.1 2007/12/31 07:17:18 sebastian Exp $ */
+/* $Id: thttpd.c,v 1.95.2.1.2.1.2.2 2008/03/18 22:23:21 rasmus Exp $ */
 
 #include "php.h"
 #include "SAPI.h"
@@ -394,6 +394,7 @@
        sapi_thttpd_register_variables,
        NULL,                                                                   
/* Log message */
        NULL,                                                                   
/* Get request time */
+       NULL,                                                                   
/* Child terminate */
 
        NULL,                                                                   
/* php.ini path override */
        NULL,                                                                   
/* Block interruptions */
http://cvs.php.net/viewvc.cgi/php-src/sapi/tux/php_tux.c?r1=1.26.2.1.2.3.2.1&r2=1.26.2.1.2.3.2.2&diff_format=u
Index: php-src/sapi/tux/php_tux.c
diff -u php-src/sapi/tux/php_tux.c:1.26.2.1.2.3.2.1 
php-src/sapi/tux/php_tux.c:1.26.2.1.2.3.2.2
--- php-src/sapi/tux/php_tux.c:1.26.2.1.2.3.2.1 Mon Dec 31 07:17:19 2007
+++ php-src/sapi/tux/php_tux.c  Tue Mar 18 22:23:21 2008
@@ -288,6 +288,7 @@
        sapi_tux_register_variables,
        NULL,                                                                   
/* Log message */
        NULL,                                                                   
/* Get request time */
+       NULL,                                                                   
/* Child terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };
http://cvs.php.net/viewvc.cgi/php-src/sapi/webjames/webjames.c?r1=1.11.2.2.2.2.2.1&r2=1.11.2.2.2.2.2.2&diff_format=u
Index: php-src/sapi/webjames/webjames.c
diff -u php-src/sapi/webjames/webjames.c:1.11.2.2.2.2.2.1 
php-src/sapi/webjames/webjames.c:1.11.2.2.2.2.2.2
--- php-src/sapi/webjames/webjames.c:1.11.2.2.2.2.2.1   Mon Dec 31 07:17:19 2007
+++ php-src/sapi/webjames/webjames.c    Tue Mar 18 22:23:21 2008
@@ -301,6 +301,7 @@
        sapi_webjames_register_variables,       /* register server variables */
        NULL,                                                                   
/* Log message */
        NULL,                                                                   
/* Get request time */
+       NULL,                                                                   
/* Child terminate */
 
        STANDARD_SAPI_MODULE_PROPERTIES
 };

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to