iliaa Tue Mar 16 17:38:18 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFH:
Fixed bug #27580 (pre-initialization errors in ap2 handler are not
being written to vhost error log).
Stop using depreciated and ignored APLOG_NOERRNO directive.
Make file not found & directory as script invocation error messages
more descriptive.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.600&r2=1.1247.2.601&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.600 php-src/NEWS:1.1247.2.601
--- php-src/NEWS:1.1247.2.600 Tue Mar 16 11:38:00 2004
+++ php-src/NEWS Tue Mar 16 17:38:16 2004
@@ -12,6 +12,8 @@
- Fixed bug #27590 (crash during shutdown when freeing persistent resources
in ZTS mode). (Ilia)
- Fixed bug #27582 (possible crashes in imagefilltoborder()). (Pierre)
+- Fixed bug #27580 (pre-initialization errors in ap2 handler are not being
+ written to vhost error log). (Ilia)
- Fixed bug #27559 (Corrected open_basedir resolving logic). (Ilia)
- Fixed bug #27530 (broken http auth when safe_mode is on and PCRE is
disabled). (Ilia)
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.29&r2=1.1.2.30&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.29
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.30
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.29 Sun Mar 7 22:16:12 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Tue Mar 16 17:38:17 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.29 2004/03/08 03:16:12 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.30 2004/03/16 22:38:17 iliaa Exp $ */
#include <fcntl.h>
@@ -53,7 +53,7 @@
/* UnixWare and Netware define shutdown to _shutdown, which causes problems later
* on when using a structure member named shutdown. Since this source
- * file does not use the system call shutdown, it is safe to #undef it.
+ * file does not use the system call shutdown, it is safe to #undef it.K
*/
#undef shutdown
@@ -288,11 +288,18 @@
* 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_rerror(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO | APLOG_STARTUP,
- 0, ctx->r, "%s", msg);
+ ap_log_rerror(APLOG_MARK, APLOG_ERR | APLOG_STARTUP, 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);
+ } else {
+ php_apache_sapi_log_message(msg);
}
}
@@ -486,14 +493,14 @@
}
if (r->finfo.filetype == 0) {
- php_apache_sapi_log_message("script not found or unable to stat");
+ php_apache_sapi_log_message_ex("script '%s' not found or unable to
stat", r);
zend_try {
zend_ini_deactivate(TSRMLS_C);
} zend_end_try();
return HTTP_NOT_FOUND;
}
if (r->finfo.filetype == APR_DIR) {
- php_apache_sapi_log_message("attempt to invoke directory as script");
+ php_apache_sapi_log_message_ex("attempt to invoke directory '%s' as
script", r);
zend_try {
zend_ini_deactivate(TSRMLS_C);
} zend_end_try();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
