rasmus          Wed Mar 19 16:37:50 2008 UTC

  Modified files:              
    /ZendEngine2        Zend.m4 zend.c zend.h zend_execute.h 
                        zend_execute_API.c zend_globals.h 
    /php-src/main       SAPI.c SAPI.h main.c php_globals.h 
    /php-src/sapi/aolserver     aolserver.c 
    /php-src/sapi/apache        mod_php.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 
    /php-src/win32/build        config.w32.h.in 
  Log:
  MFB
  
  Here are the signal changes from the 5.3 branch that optimizes signal
  handler registration and switches from longjmp to siglongjmp in order
  to make signal mask handling consistent across different UNIX operating
  systems.
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/Zend.m4?r1=1.65&r2=1.66&diff_format=u
Index: ZendEngine2/Zend.m4
diff -u ZendEngine2/Zend.m4:1.65 ZendEngine2/Zend.m4:1.66
--- ZendEngine2/Zend.m4:1.65    Mon Mar 10 15:09:20 2008
+++ ZendEngine2/Zend.m4 Wed Mar 19 16:37:48 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: Zend.m4,v 1.65 2008/03/10 15:09:20 felipe Exp $
+dnl $Id: Zend.m4,v 1.66 2008/03/19 16:37:48 rasmus Exp $
 dnl
 dnl This file contains Zend specific autoconf functions.
 dnl
@@ -110,7 +110,7 @@
 AC_FUNC_VPRINTF
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass)
+AC_CHECK_FUNCS(memcpy strdup getpid kill strtod strtol finite fpclass 
sigsetjmp)
 AC_ZEND_BROKEN_SPRINTF
 
 AC_CHECK_FUNCS(finite isfinite isinf isnan)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.410&r2=1.411&diff_format=u
Index: ZendEngine2/zend.c
diff -u ZendEngine2/zend.c:1.410 ZendEngine2/zend.c:1.411
--- ZendEngine2/zend.c:1.410    Tue Mar 18 08:36:49 2008
+++ ZendEngine2/zend.c  Wed Mar 19 16:37:48 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.c,v 1.410 2008/03/18 08:36:49 dmitry Exp $ */
+/* $Id: zend.c,v 1.411 2008/03/19 16:37:48 rasmus Exp $ */
 
 #include "zend.h"
 #include "zend_extensions.h"
@@ -1273,7 +1273,7 @@
        CG(unclean_shutdown) = 1;
        CG(in_compilation) = EG(in_execution) = 0;
        EG(current_execute_data) = NULL;
-       longjmp(*EG(bailout), FAILURE);
+       LONGJMP(*EG(bailout), FAILURE);
 }
 /* }}} */
 END_EXTERN_C()
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.351&r2=1.352&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.351 ZendEngine2/zend.h:1.352
--- ZendEngine2/zend.h:1.351    Sat Mar  8 22:03:21 2008
+++ ZendEngine2/zend.h  Wed Mar 19 16:37:48 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend.h,v 1.351 2008/03/08 22:03:21 felipe Exp $ */
+/* $Id: zend.h,v 1.352 2008/03/19 16:37:48 rasmus Exp $ */
 
 #ifndef ZEND_H
 #define ZEND_H
@@ -566,13 +566,23 @@
 
 #define zend_bailout()         _zend_bailout(__FILE__, __LINE__)
 
+#ifdef HAVE_SIGSETJMP
+#      define SETJMP(a) sigsetjmp(a, 0)
+#      define LONGJMP(a,b) siglongjmp(a, b)
+#      define JMP_BUF sigjmp_buf
+#else
+#      define SETJMP(a) setjmp(a)
+#      define LONGJMP(a,b) longjmp(a, b)
+#      define JMP_BUF jmp_buf
+#endif
+
 #define zend_try                                                               
                                \
        {                                                                       
                                                \
-               jmp_buf *__orig_bailout = EG(bailout);                          
        \
-               jmp_buf __bailout;                                              
                                \
+               JMP_BUF *__orig_bailout = EG(bailout);                          
        \
+               JMP_BUF __bailout;                                              
                                \
                                                                                
                                                \
                EG(bailout) = &__bailout;                                       
                        \
-               if (setjmp(__bailout)==0) {
+               if (SETJMP(__bailout)==0) {
 #define zend_catch                                                             
                                \
                } else {                                                        
                                        \
                        EG(bailout) = __orig_bailout;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.h?r1=1.114&r2=1.115&diff_format=u
Index: ZendEngine2/zend_execute.h
diff -u ZendEngine2/zend_execute.h:1.114 ZendEngine2/zend_execute.h:1.115
--- ZendEngine2/zend_execute.h:1.114    Wed Mar 12 08:53:10 2008
+++ ZendEngine2/zend_execute.h  Wed Mar 19 16:37:48 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute.h,v 1.114 2008/03/12 08:53:10 dmitry Exp $ */
+/* $Id: zend_execute.h,v 1.115 2008/03/19 16:37:48 rasmus Exp $ */
 
 #ifndef ZEND_EXECUTE_H
 #define ZEND_EXECUTE_H
@@ -317,7 +317,7 @@
 ZEND_API uint zend_get_executed_lineno(TSRMLS_D);
 ZEND_API zend_bool zend_is_executing(TSRMLS_D);
 
-ZEND_API void zend_set_timeout(long seconds);
+ZEND_API void zend_set_timeout(long seconds, int reset_signals);
 ZEND_API void zend_unset_timeout(TSRMLS_D);
 ZEND_API void zend_timeout(int dummy);
 ZEND_API zend_class_entry *zend_fetch_class(char *class_name, uint 
class_name_len, int fetch_type TSRMLS_DC);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.441&r2=1.442&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.441 
ZendEngine2/zend_execute_API.c:1.442
--- ZendEngine2/zend_execute_API.c:1.441        Tue Mar 18 08:36:49 2008
+++ ZendEngine2/zend_execute_API.c      Wed Mar 19 16:37:48 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_execute_API.c,v 1.441 2008/03/18 08:36:49 dmitry Exp $ */
+/* $Id: zend_execute_API.c,v 1.442 2008/03/19 16:37:48 rasmus Exp $ */
 
 #include <stdio.h>
 #include <signal.h>
@@ -1710,15 +1710,15 @@
 #define SIGPROF 27
 #endif
 
-void zend_set_timeout(long seconds) /* {{{ */
+void zend_set_timeout(long seconds, int reset_signals) /* {{{ */
 {
        TSRMLS_FETCH();
 
        EG(timeout_seconds) = seconds;
+#ifdef ZEND_WIN32
        if(!seconds) {
                return;
        }
-#ifdef ZEND_WIN32
        if (timeout_thread_initialized == 0 && 
InterlockedIncrement(&timeout_thread_initialized) == 1) {
                /* We start up this process-wide thread here and not in 
zend_startup(), because if Zend
                 * is initialized inside a DllMain(), you're not supposed to 
start threads from it.
@@ -1731,22 +1731,30 @@
        {
                struct itimerval t_r;           /* timeout requested */
                sigset_t sigset;
-
-               t_r.it_value.tv_sec = seconds;
-               t_r.it_value.tv_usec = t_r.it_interval.tv_sec = 
t_r.it_interval.tv_usec = 0;
+               if(seconds) {
+                       t_r.it_value.tv_sec = seconds;
+                       t_r.it_value.tv_usec = t_r.it_interval.tv_sec = 
t_r.it_interval.tv_usec = 0;
 
 #      ifdef __CYGWIN__
-               setitimer(ITIMER_REAL, &t_r, NULL);
-               signal(SIGALRM, zend_timeout);
-               sigemptyset(&sigset);
-               sigaddset(&sigset, SIGALRM);
+                       setitimer(ITIMER_REAL, &t_r, NULL);
+               }
+               if(reset_signals) {
+                       signal(SIGALRM, zend_timeout);
+                       sigemptyset(&sigset);
+                       sigaddset(&sigset, SIGALRM);
+               }
 #      else
-               setitimer(ITIMER_PROF, &t_r, NULL);
-               signal(SIGPROF, zend_timeout);
-               sigemptyset(&sigset);
-               sigaddset(&sigset, SIGPROF);
+                       setitimer(ITIMER_PROF, &t_r, NULL);
+               }
+               if(reset_signals) {
+                       signal(SIGPROF, zend_timeout);
+                       sigemptyset(&sigset);
+                       sigaddset(&sigset, SIGPROF);
+               }
 #      endif
-               sigprocmask(SIG_UNBLOCK, &sigset, NULL);
+               if(reset_signals) {
+                       sigprocmask(SIG_UNBLOCK, &sigset, NULL);
+               }
        }
 #      endif
 #endif
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_globals.h?r1=1.176&r2=1.177&diff_format=u
Index: ZendEngine2/zend_globals.h
diff -u ZendEngine2/zend_globals.h:1.176 ZendEngine2/zend_globals.h:1.177
--- ZendEngine2/zend_globals.h:1.176    Tue Mar 18 08:36:49 2008
+++ ZendEngine2/zend_globals.h  Wed Mar 19 16:37:48 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_globals.h,v 1.176 2008/03/18 08:36:49 dmitry Exp $ */
+/* $Id: zend_globals.h,v 1.177 2008/03/19 16:37:48 rasmus Exp $ */
 
 #ifndef ZEND_GLOBALS_H
 #define ZEND_GLOBALS_H
@@ -170,7 +170,7 @@
 
        HashTable included_files;       /* files already included */
 
-       jmp_buf *bailout;
+       JMP_BUF *bailout;
 
        int error_reporting;
        int orig_error_reporting;
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.229&r2=1.230&diff_format=u
Index: php-src/main/SAPI.c
diff -u php-src/main/SAPI.c:1.229 php-src/main/SAPI.c:1.230
--- php-src/main/SAPI.c:1.229   Mon Jan 28 16:08:14 2008
+++ php-src/main/SAPI.c Wed Mar 19 16:37:48 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: SAPI.c,v 1.229 2008/01/28 16:08:14 scottmac Exp $ */
+/* $Id: SAPI.c,v 1.230 2008/03/19 16:37:48 rasmus Exp $ */
 
 #include <ctype.h>
 #include <sys/stat.h>
@@ -933,6 +933,12 @@
        return SG(global_request_time);
 }
 
+SAPI_API void sapi_terminate_process(TSRMLS_D) {
+       if (sapi_module.terminate_process) {
+               sapi_module.terminate_process(TSRMLS_C);
+       }
+}
+
 /*
  * Local variables:
  * tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.h?r1=1.123&r2=1.124&diff_format=u
Index: php-src/main/SAPI.h
diff -u php-src/main/SAPI.h:1.123 php-src/main/SAPI.h:1.124
--- php-src/main/SAPI.h:1.123   Wed Jan 30 09:56:22 2008
+++ php-src/main/SAPI.h Wed Mar 19 16:37:48 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: SAPI.h,v 1.123 2008/01/30 09:56:22 dmitry Exp $ */
+/* $Id: SAPI.h,v 1.124 2008/03/19 16:37:48 rasmus Exp $ */
 
 #ifndef SAPI_H
 #define SAPI_H
@@ -208,6 +208,7 @@
 SAPI_API int sapi_get_target_uid(uid_t * TSRMLS_DC);
 SAPI_API int sapi_get_target_gid(gid_t * TSRMLS_DC);
 SAPI_API time_t sapi_get_request_time(TSRMLS_D);
+SAPI_API void sapi_terminate_process(TSRMLS_D);
 END_EXTERN_C()
 
 struct _sapi_module_struct {
@@ -237,6 +238,7 @@
        void (*register_server_variables)(zval *track_vars_array TSRMLS_DC);
        void (*log_message)(char *message);
        time_t (*get_request_time)(TSRMLS_D);
+       void (*terminate_process)(TSRMLS_D);
 
        char *php_ini_path_override;
 
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.765&r2=1.766&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.765 php-src/main/main.c:1.766
--- php-src/main/main.c:1.765   Wed Mar 19 12:40:48 2008
+++ php-src/main/main.c Wed Mar 19 16:37:48 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.765 2008/03/19 12:40:48 tony2001 Exp $ */
+/* $Id: main.c,v 1.766 2008/03/19 16:37:48 rasmus Exp $ */
 
 /* {{{ includes
  */
@@ -208,7 +208,7 @@
                return SUCCESS;
        }
        zend_unset_timeout(TSRMLS_C);
-       zend_set_timeout(EG(timeout_seconds));
+       zend_set_timeout(EG(timeout_seconds), 0);
        return SUCCESS;
 }
 /* }}} */
@@ -554,6 +554,7 @@
 
        STD_PHP_INI_ENTRY("user_ini.filename",          ".user.ini",    
PHP_INI_SYSTEM, OnUpdateString, user_ini_filename,      php_core_globals,       
core_globals)
        STD_PHP_INI_ENTRY("user_ini.cache_ttl",         "300",                  
PHP_INI_SYSTEM, OnUpdateLong,   user_ini_cache_ttl,     php_core_globals,       
core_globals)
+       STD_PHP_INI_BOOLEAN("exit_on_timeout",          "0",            
PHP_INI_ALL,            OnUpdateBool,   exit_on_timeout,        
php_core_globals,       core_globals)
 PHP_INI_END()
 /* }}} */
 
@@ -1309,7 +1310,8 @@
 void php_on_timeout(int seconds TSRMLS_DC) /* {{{ */
 {
        PG(connection_status) |= PHP_CONNECTION_TIMEOUT;
-       zend_set_timeout(EG(timeout_seconds));
+       zend_set_timeout(EG(timeout_seconds), 0);
+       if(PG(exit_on_timeout)) sapi_terminate_process(TSRMLS_C);
 }
 /* }}} */
 
@@ -1340,7 +1342,7 @@
                        PG(connection_status) = PHP_CONNECTION_NORMAL;
 
                        zend_activate(TSRMLS_C);
-                       zend_set_timeout(EG(timeout_seconds));
+                       zend_set_timeout(EG(timeout_seconds), 1);
                        zend_activate_modules(TSRMLS_C);
                        PG(modules_activated)=1;
                } zend_catch {
@@ -1384,9 +1386,9 @@
                sapi_activate(TSRMLS_C);
 
                if (PG(max_input_time) == -1) {
-                       zend_set_timeout(EG(timeout_seconds));
+                       zend_set_timeout(EG(timeout_seconds), 1);
                } else {
-                       zend_set_timeout(PG(max_input_time));
+                       zend_set_timeout(PG(max_input_time), 1);
                }
 
                /* Disable realpath cache if safe_mode or open_basedir are set 
*/
@@ -2191,7 +2193,7 @@
 #ifdef PHP_WIN32
                        zend_unset_timeout(TSRMLS_C);
 #endif
-                       zend_set_timeout(INI_INT("max_execution_time"));
+                       zend_set_timeout(EG(timeout_seconds), 0);
                }
                retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, 
prepend_file_p, primary_file, append_file_p) == SUCCESS);
 
http://cvs.php.net/viewvc.cgi/php-src/main/php_globals.h?r1=1.117&r2=1.118&diff_format=u
Index: php-src/main/php_globals.h
diff -u php-src/main/php_globals.h:1.117 php-src/main/php_globals.h:1.118
--- php-src/main/php_globals.h:1.117    Wed Mar 12 20:53:04 2008
+++ php-src/main/php_globals.h  Wed Mar 19 16:37:48 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_globals.h,v 1.117 2008/03/12 20:53:04 stas Exp $ */
+/* $Id: php_globals.h,v 1.118 2008/03/19 16:37:48 rasmus Exp $ */
 
 #ifndef PHP_GLOBALS_H
 #define PHP_GLOBALS_H
@@ -140,6 +140,7 @@
 
        char *disable_functions;
        char *disable_classes;
+       zend_bool exit_on_timeout;
 #ifdef PHP_WIN32
        zend_bool com_initialized;
 #endif
http://cvs.php.net/viewvc.cgi/php-src/sapi/aolserver/aolserver.c?r1=1.86&r2=1.87&diff_format=u
Index: php-src/sapi/aolserver/aolserver.c
diff -u php-src/sapi/aolserver/aolserver.c:1.86 
php-src/sapi/aolserver/aolserver.c:1.87
--- php-src/sapi/aolserver/aolserver.c:1.86     Mon Dec 31 07:12:19 2007
+++ php-src/sapi/aolserver/aolserver.c  Wed Mar 19 16:37:48 2008
@@ -22,7 +22,7 @@
  * - CGI/1.1 conformance
  */
 
-/* $Id: aolserver.c,v 1.86 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: aolserver.c,v 1.87 2008/03/19 16:37:48 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.86 2007/12/31 07:12:19 sebastian Exp $");
+       php_info_print_table_row(2, "SAPI module version", "$Id: aolserver.c,v 
1.87 2008/03/19 16:37:48 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/apache/mod_php.c?r1=1.6&r2=1.7&diff_format=u
Index: php-src/sapi/apache/mod_php.c
diff -u php-src/sapi/apache/mod_php.c:1.6 php-src/sapi/apache/mod_php.c:1.7
--- php-src/sapi/apache/mod_php.c:1.6   Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache/mod_php.c       Wed Mar 19 16:37:48 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                      |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php.c,v 1.6 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: mod_php.c,v 1.7 2008/03/19 16:37:48 rasmus Exp $ */
 
 #include "php_apache_http.h"
 #include "http_conf_globals.h"
@@ -431,6 +431,14 @@
 }
 /* }}} */
 
+/* {{{ sapi_apache_child_terminate
+ */
+static void sapi_apache_child_terminate(TSRMLS_D)
+{
+       ap_child_terminate((request_rec *)SG(server_context));
+}
+/* }}} */
+
 /* {{{ sapi_module_struct apache_sapi_module
  */
 static sapi_module_struct apache_sapi_module = {
@@ -460,6 +468,7 @@
        sapi_apache_register_server_variables,          /* register server 
variables */
        php_apache_log_message,                 /* Log message */
        php_apache_get_request_time,    /* Get request time */
+       sapi_apache_child_terminate,
 
        NULL,                                                   /* php.ini path 
override */
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.147&r2=1.148&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.147 
php-src/sapi/apache2filter/sapi_apache2.c:1.148
--- php-src/sapi/apache2filter/sapi_apache2.c:1.147     Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache2filter/sapi_apache2.c   Wed Mar 19 16:37:48 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.147 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.148 2008/03/19 16:37:48 rasmus Exp $ */
 
 #include <fcntl.h>
 
@@ -343,6 +343,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.86&r2=1.87&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.86 
php-src/sapi/apache2handler/sapi_apache2.c:1.87
--- php-src/sapi/apache2handler/sapi_apache2.c:1.86     Wed Jan 16 15:50:53 2008
+++ php-src/sapi/apache2handler/sapi_apache2.c  Wed Mar 19 16:37:48 2008
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.86 2008/01/16 15:50:53 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.87 2008/03/19 16:37:48 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.24&r2=1.25&diff_format=u
Index: php-src/sapi/apache_hooks/mod_php5.c
diff -u php-src/sapi/apache_hooks/mod_php5.c:1.24 
php-src/sapi/apache_hooks/mod_php5.c:1.25
--- php-src/sapi/apache_hooks/mod_php5.c:1.24   Mon Dec 31 07:12:19 2007
+++ php-src/sapi/apache_hooks/mod_php5.c        Wed Mar 19 16:37:48 2008
@@ -17,7 +17,7 @@
    | PHP 4.0 patches by Zeev Suraski <[EMAIL PROTECTED]>                       
                  |
    +----------------------------------------------------------------------+
  */
-/* $Id: mod_php5.c,v 1.24 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: mod_php5.c,v 1.25 2008/03/19 16:37:48 rasmus Exp $ */
 
 #include "php_apache_http.h"
 
@@ -521,6 +521,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.39&r2=1.40&diff_format=u
Index: php-src/sapi/caudium/caudium.c
diff -u php-src/sapi/caudium/caudium.c:1.39 php-src/sapi/caudium/caudium.c:1.40
--- php-src/sapi/caudium/caudium.c:1.39 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/caudium/caudium.c      Wed Mar 19 16:37:49 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: caudium.c,v 1.39 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: caudium.c,v 1.40 2008/03/19 16:37:49 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.39 
2007/12/31 07:12:19 sebastian Exp $");
+  php_info_print_table_row(2, "SAPI module version", "$Id: caudium.c,v 1.40 
2008/03/19 16:37:49 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.351&r2=1.352&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.351 php-src/sapi/cgi/cgi_main.c:1.352
--- php-src/sapi/cgi/cgi_main.c:1.351   Tue Mar 18 08:36:49 2008
+++ php-src/sapi/cgi/cgi_main.c Wed Mar 19 16:37:49 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: cgi_main.c,v 1.351 2008/03/18 08:36:49 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.352 2008/03/19 16:37:49 rasmus Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -806,6 +806,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.186&r2=1.187&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.186 php-src/sapi/cli/php_cli.c:1.187
--- php-src/sapi/cli/php_cli.c:1.186    Tue Mar 18 08:36:49 2008
+++ php-src/sapi/cli/php_cli.c  Wed Mar 19 16:37:49 2008
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.186 2008/03/18 08:36:49 dmitry Exp $ */
+/* $Id: php_cli.c,v 1.187 2008/03/19 16:37:49 rasmus Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -412,6 +412,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.16&r2=1.17&diff_format=u
Index: php-src/sapi/continuity/capi.c
diff -u php-src/sapi/continuity/capi.c:1.16 php-src/sapi/continuity/capi.c:1.17
--- php-src/sapi/continuity/capi.c:1.16 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/continuity/capi.c      Wed Mar 19 16:37:49 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.16 $");
+        php_info_print_table_row(2, "Continuity Module Revision", "$Revision: 
1.17 $");
         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.23&r2=1.24&diff_format=u
Index: php-src/sapi/embed/php_embed.c
diff -u php-src/sapi/embed/php_embed.c:1.23 php-src/sapi/embed/php_embed.c:1.24
--- php-src/sapi/embed/php_embed.c:1.23 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/embed/php_embed.c      Wed Mar 19 16:37:49 2008
@@ -15,7 +15,7 @@
    | Author: Edin Kadribasic <[EMAIL PROTECTED]>                              |
    +----------------------------------------------------------------------+
 */
-/* $Id: php_embed.c,v 1.23 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: php_embed.c,v 1.24 2008/03/19 16:37:49 rasmus Exp $ */
 
 #include "php_embed.h"
 #include <ext/standard/dl.h>
@@ -135,6 +135,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.12&r2=1.13&diff_format=u
Index: php-src/sapi/isapi/php5isapi.c
diff -u php-src/sapi/isapi/php5isapi.c:1.12 php-src/sapi/isapi/php5isapi.c:1.13
--- php-src/sapi/isapi/php5isapi.c:1.12 Mon Dec 31 07:12:19 2007
+++ php-src/sapi/isapi/php5isapi.c      Wed Mar 19 16:37:49 2008
@@ -16,7 +16,7 @@
    |          Ben Mansell <[EMAIL PROTECTED]> (Zeus Support)                   
|
    +----------------------------------------------------------------------+
  */
-/* $Id: php5isapi.c,v 1.12 2007/12/31 07:12:19 sebastian Exp $ */
+/* $Id: php5isapi.c,v 1.13 2008/03/19 16:37:49 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.23&r2=1.24&diff_format=u
Index: php-src/sapi/milter/php_milter.c
diff -u php-src/sapi/milter/php_milter.c:1.23 
php-src/sapi/milter/php_milter.c:1.24
--- php-src/sapi/milter/php_milter.c:1.23       Tue Mar 18 08:36:49 2008
+++ php-src/sapi/milter/php_milter.c    Wed Mar 19 16:37:49 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.86&r2=1.87&diff_format=u
Index: php-src/sapi/nsapi/nsapi.c
diff -u php-src/sapi/nsapi/nsapi.c:1.86 php-src/sapi/nsapi/nsapi.c:1.87
--- php-src/sapi/nsapi/nsapi.c:1.86     Sun Mar  9 16:07:46 2008
+++ php-src/sapi/nsapi/nsapi.c  Wed Mar 19 16:37:49 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: nsapi.c,v 1.86 2008/03/09 16:07:46 felipe Exp $ */
+/* $Id: nsapi.c,v 1.87 2008/03/19 16:37:49 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.86 
$");
+       php_info_print_table_row(2, "NSAPI Module Revision", "$Revision: 1.87 
$");
        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" );
@@ -753,6 +753,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.44&r2=1.45&diff_format=u
Index: php-src/sapi/phttpd/phttpd.c
diff -u php-src/sapi/phttpd/phttpd.c:1.44 php-src/sapi/phttpd/phttpd.c:1.45
--- php-src/sapi/phttpd/phttpd.c:1.44   Mon Dec 31 07:12:20 2007
+++ php-src/sapi/phttpd/phttpd.c        Wed Mar 19 16:37:49 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.63&r2=1.64&diff_format=u
Index: php-src/sapi/pi3web/pi3web_sapi.c
diff -u php-src/sapi/pi3web/pi3web_sapi.c:1.63 
php-src/sapi/pi3web/pi3web_sapi.c:1.64
--- php-src/sapi/pi3web/pi3web_sapi.c:1.63      Mon Dec 31 07:12:20 2007
+++ php-src/sapi/pi3web/pi3web_sapi.c   Wed Mar 19 16:37:49 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: pi3web_sapi.c,v 1.63 2007/12/31 07:12:20 sebastian Exp $ */
+/* $Id: pi3web_sapi.c,v 1.64 2008/03/19 16:37:49 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.63 2007/12/31 07:12:20 sebastian Exp $");
+       php_info_print_table_row(2, "Pi3Web SAPI module version", "$Id: 
pi3web_sapi.c,v 1.64 2008/03/19 16:37:49 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.65&r2=1.66&diff_format=u
Index: php-src/sapi/roxen/roxen.c
diff -u php-src/sapi/roxen/roxen.c:1.65 php-src/sapi/roxen/roxen.c:1.66
--- php-src/sapi/roxen/roxen.c:1.65     Mon Dec 31 07:12:20 2007
+++ php-src/sapi/roxen/roxen.c  Wed Mar 19 16:37:49 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: roxen.c,v 1.65 2007/12/31 07:12:20 sebastian Exp $ */
+/* $Id: roxen.c,v 1.66 2008/03/19 16:37:49 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.65 
2007/12/31 07:12:20 sebastian Exp $");
+  php_info_print_table_row(2, "SAPI module version", "$Id: roxen.c,v 1.66 
2008/03/19 16:37:49 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.98&r2=1.99&diff_format=u
Index: php-src/sapi/thttpd/thttpd.c
diff -u php-src/sapi/thttpd/thttpd.c:1.98 php-src/sapi/thttpd/thttpd.c:1.99
--- php-src/sapi/thttpd/thttpd.c:1.98   Mon Dec 31 07:12:20 2007
+++ php-src/sapi/thttpd/thttpd.c        Wed Mar 19 16:37:49 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: thttpd.c,v 1.98 2007/12/31 07:12:20 sebastian Exp $ */
+/* $Id: thttpd.c,v 1.99 2008/03/19 16:37:49 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.30&r2=1.31&diff_format=u
Index: php-src/sapi/tux/php_tux.c
diff -u php-src/sapi/tux/php_tux.c:1.30 php-src/sapi/tux/php_tux.c:1.31
--- php-src/sapi/tux/php_tux.c:1.30     Mon Dec 31 07:12:20 2007
+++ php-src/sapi/tux/php_tux.c  Wed Mar 19 16:37:49 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.16&r2=1.17&diff_format=u
Index: php-src/sapi/webjames/webjames.c
diff -u php-src/sapi/webjames/webjames.c:1.16 
php-src/sapi/webjames/webjames.c:1.17
--- php-src/sapi/webjames/webjames.c:1.16       Mon Dec 31 07:12:20 2007
+++ php-src/sapi/webjames/webjames.c    Wed Mar 19 16:37:49 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
 };
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32.h.in?r1=1.14&r2=1.15&diff_format=u
Index: php-src/win32/build/config.w32.h.in
diff -u php-src/win32/build/config.w32.h.in:1.14 
php-src/win32/build/config.w32.h.in:1.15
--- php-src/win32/build/config.w32.h.in:1.14    Wed Jul 11 17:39:04 2007
+++ php-src/win32/build/config.w32.h.in Wed Mar 19 16:37:49 2008
@@ -1,6 +1,6 @@
 /*
        Build Configuration Template for Win32.
-       $Id: config.w32.h.in,v 1.14 2007/07/11 17:39:04 johannes Exp $
+       $Id: config.w32.h.in,v 1.15 2008/03/19 16:37:49 rasmus Exp $
 */
 
 /* Default PHP / PEAR directories */
@@ -53,6 +53,7 @@
 #define NEED_ISBLANK 1
 #define DISCARD_PATH 0
 #undef HAVE_SETITIMER
+#undef HAVE_SIGSETJMP
 #undef HAVE_IODBC
 #define HAVE_LIBDL 1
 #define HAVE_GETTIMEOFDAY 1

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

Reply via email to