Date: Sun, 5 Mar 2006 08:00:27 GMT From: Craig Boston <craig@yekse.gank.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/94034: www/suphp doesn't work with Apache 2.2 (patch) Message-ID: <200603050800.k2580RLm092685@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/94034; it has been noted by GNATS.
From: Craig Boston <craig@yekse.gank.org>
To: bug-followup@freebsd.org
Cc:
Subject: Re: ports/94034: www/suphp doesn't work with Apache 2.2 (patch)
Date: Sun, 5 Mar 2006 01:51:53 -0600
--6TrnltStXW4iwmi0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
It turns out there is another small issue with Apache 2.2 and suphp. A
revised version of patch-src::apache2::mod_suphp.c is attached...
With both of these applied and php5-cgi installed I have squirrelmail
working under suphp again.
--6TrnltStXW4iwmi0
Content-Type: text/x-csrc; charset=us-ascii
Content-Disposition: attachment; filename="patch-src::apache2::mod_suphp.c"
--- src/apache2/mod_suphp.c.orig Tue Jul 13 04:43:41 2004
+++ src/apache2/mod_suphp.c Thu Mar 2 20:14:04 2006
@@ -56,7 +56,7 @@
return -1;
rv = apr_bucket_read(b, &bucket_data, &bucket_data_len, APR_BLOCK_READ);
- if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0))
+ if (!(rv == APR_SUCCESS) || (bucket_data_len == 0))
{
return 0;
}
@@ -463,7 +463,13 @@
if (((rv = apr_procattr_create(&procattr, p)) != APR_SUCCESS)
|| ((rv = apr_procattr_io_set(procattr, APR_CHILD_BLOCK, APR_CHILD_BLOCK, APR_CHILD_BLOCK)) != APR_SUCCESS)
+
+/* XXX: Pending review by both the Apache APR folks, as well as the suPHP folks. See thread:
+ * http://lists.marsching.biz/pipermail/suphp/2004-July/000756.html
+ */
+/*
|| ((rv = apr_procattr_dir_set(procattr, ap_make_dirstr_parent(r->pool, r->filename))) != APR_SUCCESS)
+*/
/* set resource limits */
@@ -524,7 +530,9 @@
return rv;
}
- APR_BRIGADE_FOREACH(bucket, bb)
+ for (bucket = APR_BRIGADE_FIRST(bb);
+ bucket != APR_BRIGADE_SENTINEL(bb);
+ bucket = APR_BUCKET_NEXT(bucket))
{
const char *data;
apr_size_t len;
@@ -595,7 +603,9 @@
const char *buf;
apr_size_t blen;
- APR_BRIGADE_FOREACH(b, bb)
+ for (b = APR_BRIGADE_FIRST(bb);
+ b != APR_BRIGADE_SENTINEL(bb);
+ b = APR_BUCKET_NEXT(b))
{
if (APR_BUCKET_IS_EOS(b))
break;
@@ -616,7 +626,9 @@
/* empty brigade (script output) */
const char *buf;
apr_size_t blen;
- APR_BRIGADE_FOREACH(b, bb)
+ for (b = APR_BRIGADE_FIRST(bb);
+ b != APR_BRIGADE_SENTINEL(bb);
+ b = APR_BUCKET_NEXT(b))
{
if (APR_BUCKET_IS_EOS(b))
break;
--6TrnltStXW4iwmi0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603050800.k2580RLm092685>