sniper Fri Apr 8 16:35:02 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFH: - Fixed bug #32587 (Apache2: errors sent to error_log do not include
timestamps)
# Also nuked the deprecated APLOG_NOERRNO's
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.872&r2=1.1247.2.873&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.872 php-src/NEWS:1.1247.2.873
--- php-src/NEWS:1.1247.2.872 Thu Apr 7 18:24:21 2005
+++ php-src/NEWS Fri Apr 8 16:35:01 2005
@@ -6,6 +6,8 @@
- 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)
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.91.2.26&r2=1.91.2.27&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.26
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.27
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.26 Fri Jan 7 01:28:36 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c Fri Apr 8 16:35:02 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.91.2.26 2005/01/07 06:28:36 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.27 2005/04/08 20:35:02 sniper Exp $ */
#include <fcntl.h>
@@ -267,18 +267,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);
}
}
@@ -356,7 +349,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;
}
@@ -467,7 +460,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);
@@ -627,7 +620,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.1.2.39&r2=1.1.2.40&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.39
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.39 Thu Mar 10 06:39:04 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Apr 8 16:35:02 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.39 2005/03/10 11:39:04 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40 2005/04/08 20:35:02 sniper Exp $ */
#include <fcntl.h>
@@ -268,23 +268,18 @@
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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
