iliaa Wed Nov 2 12:55:17 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
Log:
Fixed bug #35059 (Apache2 crash with mod_rewrite).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.920.2.65&r2=1.1247.2.920.2.66&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.65 php-src/NEWS:1.1247.2.920.2.66
--- php-src/NEWS:1.1247.2.920.2.65 Wed Nov 2 10:03:33 2005
+++ php-src/NEWS Wed Nov 2 12:55:14 2005
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, Version 4.4.2
- Missing safe_mode/open_basedir check in cURL extension. (Ilia)
+- Fixed bug #35059 (Apache2 crash with mod_rewrite). (Ilia)
- Fixed bug #34996 (ImageTrueColorToPalette() crashes when ncolors is
zero). (Tony)
- Fixed bug #33760 (cURL needs to implement CRYPTO_callback functions to
prevent
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.40.2.5&r2=1.1.2.40.2.6&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.5
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.6
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.40.2.5 Wed Oct 12
17:41:36 2005
+++ php-src/sapi/apache2handler/sapi_apache2.c Wed Nov 2 12:55:17 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.40.2.5 2005/10/12 21:41:36 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.40.2.6 2005/11/02 17:55:17 iliaa Exp $ */
#include <fcntl.h>
@@ -535,7 +535,7 @@
if (!parent_req) {
parent_req = ctx->r;
}
- if (parent_req && strcmp(parent_req->handler, PHP_MAGIC_TYPE)
&& strcmp(parent_req->handler, PHP_SOURCE_MAGIC_TYPE) &&
strcmp(parent_req->handler, PHP_SCRIPT)) {
+ if (parent_req && parent_req->handler &&
strcmp(parent_req->handler, PHP_MAGIC_TYPE) && strcmp(parent_req->handler,
PHP_SOURCE_MAGIC_TYPE) && strcmp(parent_req->handler, PHP_SCRIPT)) {
if (php_apache_request_ctor(r, ctx TSRMLS_CC)!=SUCCESS)
{
zend_bailout();
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
