Grokbase Groups PHP php-cvs May 2009
FAQ
derick Sun May 3 19:08:29 2009 UTC

Modified files:
/php-src/main main.c
Log:
- Fixed bug #45191 (error_log ignores date.timezone php.ini val when
setting logging timestamps).


http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.797&r2=1.798&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.797 php-src/main/main.c:1.798
--- php-src/main/main.c:1.797 Thu Apr 30 09:12:26 2009
+++ php-src/main/main.c Sun May 3 19:08:28 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/

-/* $Id: main.c,v 1.797 2009/04/30 09:12:26 pajoye Exp $ */
+/* $Id: main.c,v 1.798 2009/05/03 19:08:28 derick Exp $ */

/* {{{ includes
*/
@@ -612,7 +612,6 @@
PHPAPI void php_log_err(char *log_message TSRMLS_DC)
{
int fd = -1;
- char error_time_str[128];
struct tm tmbuf;
time_t error_time;

@@ -628,14 +627,17 @@
if (fd != -1) {
char *tmp;
int len;
+ char *error_time_str;
+
time(&error_time);
- strftime(error_time_str, sizeof(error_time_str), "%d-%b-%Y %H:%M:%S", php_localtime_r(&error_time, &tmbuf));
+ error_time_str = php_format_date("d-M-Y H:i:s", 11, error_time, 1 TSRMLS_CC);
len = spprintf(&tmp, 0, "[%s] %s%s", error_time_str, log_message, PHP_EOL);
#ifdef PHP_WIN32
php_flock(fd, 2);
#endif
write(fd, tmp, len);
efree(tmp);
+ efree(error_time_str);
close(fd);
return;
}

Search Discussions

  • Derick Rethans at May 4, 2009 at 7:55 pm
    derick Mon May 4 19:55:33 2009 UTC

    Modified files:
    /php-src/main main.c
    Log:
    - Fixed warnings

    http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.798&r2=1.799&diff_format=u
    Index: php-src/main/main.c
    diff -u php-src/main/main.c:1.798 php-src/main/main.c:1.799
    --- php-src/main/main.c:1.798 Sun May 3 19:08:28 2009
    +++ php-src/main/main.c Mon May 4 19:55:33 2009
    @@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
    */

    -/* $Id: main.c,v 1.798 2009/05/03 19:08:28 derick Exp $ */
    +/* $Id: main.c,v 1.799 2009/05/04 19:55:33 derick Exp $ */

    /* {{{ includes
    */
    @@ -59,6 +59,7 @@
    #include "fopen_wrappers.h"
    #include "ext/standard/php_standard.h"
    #include "ext/standard/php_string.h"
    +#include "ext/date/php_date.h"
    #include "php_variables.h"
    #include "ext/standard/credits.h"
    #ifdef PHP_WIN32
    @@ -612,7 +613,6 @@
    PHPAPI void php_log_err(char *log_message TSRMLS_DC)
    {
    int fd = -1;
    - struct tm tmbuf;
    time_t error_time;

    /* Try to use the specified logging location. */
  • Scott MacVicar at May 30, 2009 at 9:47 am
    scottmac Sat May 30 09:47:39 2009 UTC

    Modified files:
    /php-src/main main.c
    Log:
    Make sure the timeout is checked in the shutdown function, patch from Etienne


    http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.799&r2=1.800&diff_format=u
    Index: php-src/main/main.c
    diff -u php-src/main/main.c:1.799 php-src/main/main.c:1.800
    --- php-src/main/main.c:1.799 Mon May 4 19:55:33 2009
    +++ php-src/main/main.c Sat May 30 09:47:39 2009
    @@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
    */

    -/* $Id: main.c,v 1.799 2009/05/04 19:55:33 derick Exp $ */
    +/* $Id: main.c,v 1.800 2009/05/30 09:47:39 scottmac Exp $ */

    /* {{{ includes
    */
    @@ -1378,7 +1378,7 @@
    void php_on_timeout(int seconds TSRMLS_DC) /* {{{ */
    {
    PG(connection_status) |= PHP_CONNECTION_TIMEOUT;
    - zend_set_timeout(EG(timeout_seconds), 0);
    + zend_set_timeout(EG(timeout_seconds), 1);
    if(PG(exit_on_timeout)) sapi_terminate_process(TSRMLS_C);
    }
    /* }}} */

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupphp-cvs @
categoriesphp
postedMay 3, '09 at 7:08p
activeMay 30, '09 at 9:47a
posts3
users2
websitephp.net

2 users in discussion

Derick Rethans: 2 posts Scott MacVicar: 1 post

People

Translate

site design / logo © 2019 Grokbase