diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2005-11-03 09:17:22 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2005-11-03 09:17:22 +0000 |
| commit | 59c11832bf6a3e7ab44e5de42ad4775ed97c614c (patch) | |
| tree | fd75c3ac18d8c76b9309373c718365290b5dd304 | |
| parent | Update to 1.03. Assign maintainership to perl@. Require perl from (diff) | |
Fix for apache2+mod_rewrite.
Obtained from: PHP CVS
Notes
Notes:
svn path=/head/; revision=147097
| -rw-r--r-- | lang/php4/files/patch-sapi_apache2handler_sapi_apache2.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lang/php4/files/patch-sapi_apache2handler_sapi_apache2.c b/lang/php4/files/patch-sapi_apache2handler_sapi_apache2.c new file mode 100644 index 000000000000..dde4289f4726 --- /dev/null +++ b/lang/php4/files/patch-sapi_apache2handler_sapi_apache2.c @@ -0,0 +1,11 @@ +--- sapi/apache2handler/sapi_apache2.c.orig Thu Nov 3 10:13:33 2005 ++++ sapi/apache2handler/sapi_apache2.c Thu Nov 3 10:14:41 2005 +@@ -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(); + } |