diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 17 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 11 |
3 files changed, 10 insertions, 20 deletions
@@ -6,6 +6,8 @@ PHP 4 NEWS - Fixed bug #32591 (ext/mysql: Unsatisfied symbol: ntohs with HP-UX). (Jani) - Fixed bug #32589 (Possible crash inside imap_mail_compose, with charsets). (Ilia) +- Fixed bug #32587 (Apache2: errors sent to error_log do not include + timestamps). (Jani) - Fixed bug #32567 (ext/gmp fails to compile in threadsafe mode). (Tony) - Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer). (adam dot greenfield at gmail dot com) diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index ddc1e9f47a..931aabe21d 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -267,18 +267,11 @@ static void php_apache_sapi_log_message(char *msg) ctx = SG(server_context); - /* We use APLOG_STARTUP because it keeps us from printing the - * data and time information at the beginning of the error log - * line. Not sure if this is correct, but it mirrors what happens - * with Apache 1.3 -- rbb - */ if (ctx == NULL) { /* we haven't initialized our ctx yet, oh well */ - ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO | APLOG_STARTUP, - 0, NULL, "%s", msg); + ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, NULL, "%s", msg); } else { - ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO | APLOG_STARTUP, - 0, ctx->r->server, "%s", msg); + ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctx->r->server, "%s", msg); } } @@ -356,7 +349,7 @@ static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, ctx = SG(server_context); if (ctx == NULL) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, f->r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, "php failed to get server context"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -467,7 +460,7 @@ static int php_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) ctx = SG(server_context); if (ctx == NULL) { - ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, f->r, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, "php failed to get server context"); zend_try { zend_ini_deactivate(TSRMLS_C); @@ -627,7 +620,7 @@ static void php_add_filter(request_rec *r, ap_filter_t *f) /* for those who still have Set*Filter PHP configured */ while (f) { if (strcmp(f->frec->name, "PHP") == 0) { - ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, r->server, "\"Set%sFilter PHP\" already configured for %s", output ? "Output" : "Input", r->uri); diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index a6c3ea0f44..48c80d732a 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -268,23 +268,18 @@ static void php_apache_sapi_log_message(char *msg) TSRMLS_FETCH(); ctx = SG(server_context); - - /* We use APLOG_STARTUP because it keeps us from printing the - * data and time information at the beginning of the error log - * line. Not sure if this is correct, but it mirrors what happens - * with Apache 1.3 -- rbb - */ + if (ctx == NULL) { /* we haven't initialized our ctx yet, oh well */ ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, NULL, "%s", msg); } else { - ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, ctx->r, "%s", msg); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, ctx->r, "%s", msg); } } static void php_apache_sapi_log_message_ex(char *msg, request_rec *r) { if (r) { - ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 0, r, msg, r->filename); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, msg, r->filename); } else { php_apache_sapi_log_message(msg); } |