sniper Fri Apr 8 16:32:14 2005 EDT
Modified files:
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handler sapi_apache2.c
Log:
- Fixed bug #32587 (Apache2: errors sent to error_log do not include
timestamps)
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.133&r2=1.134&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.133
php-src/sapi/apache2filter/sapi_apache2.c:1.134
--- php-src/sapi/apache2filter/sapi_apache2.c:1.133 Mon Mar 14 14:25:38 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c Fri Apr 8 16:32:13 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.133 2005/03/14 19:25:38 rasmus Exp $ */
+/* $Id: sapi_apache2.c,v 1.134 2005/04/08 20:32:13 sniper Exp $ */
#include <fcntl.h>
@@ -272,18 +272,11 @@
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);
}
}
@@ -363,7 +356,7 @@
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;
}
@@ -475,7 +468,7 @@
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);
@@ -644,7 +637,7 @@
/* 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);
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.53&r2=1.54&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.53
php-src/sapi/apache2handler/sapi_apache2.c:1.54
--- php-src/sapi/apache2handler/sapi_apache2.c:1.53 Mon Mar 14 14:25:38 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Apr 8 16:32:14 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.53 2005/03/14 19:25:38 rasmus Exp $ */
+/* $Id: sapi_apache2.c,v 1.54 2005/04/08 20:32:14 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -264,22 +264,17 @@
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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
