sniper Fri Apr 8 16:34:04 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.1760.2.317&r2=1.1760.2.318&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.317 php-src/NEWS:1.1760.2.318
--- php-src/NEWS:1.1760.2.317 Fri Apr 8 12:00:42 2005
+++ php-src/NEWS Fri Apr 8 16:34:02 2005
@@ -7,6 +7,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 #32560 (configure looks for incorrect db2 library). (Tony)
- Fixed bug #32553 (mmap loads only the 1st 2000000 bytes on Win32). (Ilia)
- Fixed bug #32533 (proc_get_status() returns the incorrect process status).
(Ilia)
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.125.2.1&r2=1.125.2.2&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.1
php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.2
--- php-src/sapi/apache2filter/sapi_apache2.c:1.125.2.1 Fri Jan 7 01:28:24 2005
+++ php-src/sapi/apache2filter/sapi_apache2.c Fri Apr 8 16:34:03 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.125.2.1 2005/01/07 06:28:24 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.125.2.2 2005/04/08 20:34:03 sniper Exp $ */
#include <fcntl.h>
@@ -272,18 +272,10 @@
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);
- }
- 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 | APLOG_STARTUP, 0, NULL,
"%s", msg);
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, ctx->r->server, "%s",
msg);
}
}
@@ -356,7 +348,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 +459,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);
@@ -636,7 +628,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.40.2.7&r2=1.40.2.8&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.7
php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.8
--- php-src/sapi/apache2handler/sapi_apache2.c:1.40.2.7 Thu Mar 10 06:23:57 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Apr 8 16:34:03 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.40.2.7 2005/03/10 11:23:57 jorton Exp $ */
+/* $Id: sapi_apache2.c,v 1.40.2.8 2005/04/08 20:34:03 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
