scottmac Fri Jul 18 13:08:08 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache2filter php_apache.h sapi_apache2.c
Log:
Fix compile error due to the removal of fteller on streams.
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/php_apache.h?r1=1.25.2.1.2.2.2.2&r2=1.25.2.1.2.2.2.3&diff_format=u
Index: php-src/sapi/apache2filter/php_apache.h
diff -u php-src/sapi/apache2filter/php_apache.h:1.25.2.1.2.2.2.2
php-src/sapi/apache2filter/php_apache.h:1.25.2.1.2.2.2.3
--- php-src/sapi/apache2filter/php_apache.h:1.25.2.1.2.2.2.2 Wed Jan 30
09:41:12 2008
+++ php-src/sapi/apache2filter/php_apache.h Fri Jul 18 13:08:08 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.h,v 1.25.2.1.2.2.2.2 2008/01/30 09:41:12 dmitry Exp $ */
+/* $Id: php_apache.h,v 1.25.2.1.2.2.2.3 2008/07/18 13:08:08 scottmac Exp $ */
#ifndef PHP_APACHE_H
#define PHP_APACHE_H
@@ -49,7 +49,6 @@
} php_struct;
typedef struct _php_apr_bucket_brigade {
- unsigned int total_len;
apr_bucket_brigade *bb;
} php_apr_bucket_brigade;
@@ -60,8 +59,7 @@
extern const command_rec php_dir_cmds[];
static size_t php_apache_read_stream(void *, char *, size_t TSRMLS_DC);
-static void php_apache_close_stream(void * TSRMLS_DC);
-static long php_apache_fteller_stream(void * TSRMLS_DC);
+static size_t php_apache_fsizer_stream(void * TSRMLS_DC);
#define APR_ARRAY_FOREACH_OPEN(arr, key, val) \
{
\
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.136.2.2.2.8.2.2&r2=1.136.2.2.2.8.2.3&diff_format=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.2
php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.3
--- php-src/sapi/apache2filter/sapi_apache2.c:1.136.2.2.2.8.2.2 Tue Mar 18
22:23:20 2008
+++ php-src/sapi/apache2filter/sapi_apache2.c Fri Jul 18 13:08:08 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.136.2.2.2.8.2.2 2008/03/18 22:23:20 rasmus Exp $ */
+/* $Id: sapi_apache2.c,v 1.136.2.2.2.8.2.3 2008/07/18 13:08:08 scottmac Exp $
*/
#include <fcntl.h>
@@ -210,7 +210,7 @@
php_struct *ctx = SG(server_context);
const apr_array_header_t *arr = apr_table_elts(ctx->r->subprocess_env);
char *key, *val;
- int new_val_len;
+ unsigned int new_val_len;
APR_ARRAY_FOREACH_OPEN(arr, key, val)
if (!val) {
@@ -468,7 +468,6 @@
} else {
pbb = f->ctx = apr_palloc(f->r->pool, sizeof(*pbb));
pbb->bb = apr_brigade_create(f->r->pool, f->c->bucket_alloc);
- pbb->total_len = 0;
}
if(ap_save_brigade(NULL, &pbb->bb, &bb, f->r->pool) != APR_SUCCESS) {
@@ -522,9 +521,9 @@
zfd.handle.stream.handle = pbb;
zfd.handle.stream.reader = php_apache_read_stream;
- zfd.handle.stream.closer = php_apache_close_stream;
- zfd.handle.stream.fteller = php_apache_fteller_stream;
- zfd.handle.stream.interactive = 0;
+ zfd.handle.stream.closer = NULL;
+ zfd.handle.stream.fsizer = php_apache_fsizer_stream;
+ zfd.handle.stream.isatty = 0;
zfd.filename = f->r->filename;
zfd.opened_path = NULL;
@@ -710,20 +709,20 @@
readlen = wantlen;
apr_brigade_flatten(rbb, buf, &readlen);
apr_brigade_cleanup(rbb);
- pbb->total_len += readlen;
return readlen;
}
-static void php_apache_close_stream(void *handle TSRMLS_DC)
-{
- return;
-}
-
-static long php_apache_fteller_stream(void *handle TSRMLS_DC)
+static size_t php_apache_fsizer_stream(void *handle TSRMLS_DC)
{
php_apr_bucket_brigade *pbb = (php_apr_bucket_brigade *)handle;
- return pbb->total_len;
+ apr_off_t actual = 0;
+
+ if (apr_brigade_length(pbb->bb, 1, &actual) == APR_SUCCESS) {
+ return actual;
+ }
+
+ return 0;
}
AP_MODULE_DECLARE_DATA module php5_module = {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
