jani            Tue Jul  7 16:43:35 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /php-src/main       main.c 
  Log:
  MFH:- Fixed bug #48247 (Infinite loop and possible crash during startup with 
errors)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1581&r2=1.2027.2.547.2.1582&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1581 php-src/NEWS:1.2027.2.547.2.1582
--- php-src/NEWS:1.2027.2.547.2.1581    Tue Jul  7 15:15:46 2009
+++ php-src/NEWS        Tue Jul  7 16:43:35 2009
@@ -26,7 +26,9 @@
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)
 - Fixed bug #48276 (date("Y") on big endian machines produces the
   wrong result). (Scott)
-- Fixed #48116 (Fixed build with Openssl 1.0). (Pierre, 
+- Fixed bug #48247 (Infinite loop and possible crash during startup with
+  errors when errors are logged). (Jani)
+- Fixed bug #48116 (Fixed build with Openssl 1.0). (Pierre, 
   Al dot Smith at aeschi dot ch dot eu dot org)
 - Fixed bug #47351 (Memory leak in DateTime). (Derick, Tobias John)
 - Fixed bug #45905 (imagefilledrectangle() clipping error).
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.70&r2=1.640.2.23.2.71&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.70 php-src/main/main.c:1.640.2.23.2.71
--- php-src/main/main.c:1.640.2.23.2.70 Mon May  4 19:55:42 2009
+++ php-src/main/main.c Tue Jul  7 16:43:35 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.70 2009/05/04 19:55:42 derick Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.71 2009/07/07 16:43:35 jani Exp $ */
 
 /* {{{ includes
  */
@@ -469,6 +469,20 @@
 static int module_startup = 1;
 static int module_shutdown = 0;
 
+/* {{{ php_during_module_startup */
+static int php_during_module_startup(void)
+{
+       return module_startup;
+}
+/* }}} */
+
+/* {{{ php_during_module_shutdown */
+static int php_during_module_shutdown(void)
+{
+       return module_shutdown;
+}
+/* }}} */
+
 /* {{{ php_log_err
  */
 PHPAPI void php_log_err(char *log_message TSRMLS_DC)
@@ -491,7 +505,7 @@
                        char *error_time_str;
 
                        time(&error_time);
-                       error_time_str = php_format_date("d-M-Y H:i:s", 11, 
error_time, 1 TSRMLS_CC);
+                       error_time_str = php_format_date("d-M-Y H:i:s", 11, 
error_time, php_during_module_startup() TSRMLS_CC);
                        len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, 
log_message, PHP_EOL);
 #ifdef PHP_WIN32
                        php_flock(fd, 2);
@@ -540,24 +554,6 @@
 }
 /* }}} */
 
-/* {{{ php_verror helpers */
-
-/* {{{ php_during_module_startup */
-static int php_during_module_startup(void)
-{
-       return module_startup;
-}
-/* }}} */
-
-/* {{{ php_during_module_shutdown */
-static int php_during_module_shutdown(void)
-{
-       return module_shutdown;
-}
-/* }}} */
-
-/* }}} */
-
 /* {{{ php_verror */
 /* php_verror is called from php_error_docref<n> functions.
  * Its purpose is to unify error messages and automatically generate clickable



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

Reply via email to