cvs: php4 /sapi/apache2handler sapi_apache2.c
| From: | Ian Holsman | Date: | Thu, 27 Mar 2003 05:31:49 +0000 |
| Subject: | cvs: php4 /sapi/apache2handler sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19794@lists.php.net to get a copy of this message | ||
ianh Thu Mar 27 00:31:49 2003 EDT
Modified files:
/php4/sapi/apache2handler sapi_apache2.c
Log:
change to a pool-based bucket instead of a transient one.
Index: php4/sapi/apache2handler/sapi_apache2.c
diff -u php4/sapi/apache2handler/sapi_apache2.c:1.10 php4/sapi/apache2handler/sapi_apache2.c:1.11
--- php4/sapi/apache2handler/sapi_apache2.c:1.10 Wed Mar 26 23:35:44 2003
+++ php4/sapi/apache2handler/sapi_apache2.c Thu Mar 27 00:31:49 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.10 2003/03/27 04:35:44 ianh Exp $ */
+/* $Id: sapi_apache2.c,v 1.11 2003/03/27 05:31:49 ianh Exp $ */
#include <fcntl.h>
@@ -73,6 +73,7 @@
apr_bucket_brigade *brigade;
request_rec *r;
php_struct *ctx;
+ char *copy_str;
if (str_length == 0) {
return 0;
@@ -82,8 +83,9 @@
r = ctx->r;
brigade = ctx->brigade;
- bucket = apr_bucket_transient_create(str, str_length,
- r->connection->bucket_alloc);
+ copy_str = apr_pmemdup( r->pool, str, str_length+1);
+ bucket = apr_bucket_pool_create(copy_str, str_length, r->pool,
r->connection->bucket_alloc);
+
APR_BRIGADE_INSERT_TAIL(brigade, bucket);
if (ap_pass_brigade(r->output_filters, brigade) != APR_SUCCESS) {