Re: [PHP-DEV] another segv in sapi_apache2

2001-08-17 Thread Sterling Hughes


applied -- thanks again.

-Sterling

> thanks.  this one gets rid of a warning...
>
> Index: sapi_apache2.c
> ===
> RCS file: /repository/php4/sapi/apache2filter/sapi_apache2.c,v
> retrieving revision 1.45
> diff -u -r1.45 sapi_apache2.c
> --- sapi_apache2.c  18 Aug 2001 01:36:29 -  1.45
> +++ sapi_apache2.c  18 Aug 2001 01:55:32 -
> @@ -238,7 +238,7 @@
> }
>
>  static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb,
> -   ap_input_mode_t mode, apr_size_t *readbytes)
> +   ap_input_mode_t mode, apr_off_t *readbytes)
>  {
> php_struct *ctx;
> long old_index;
>
>
>


-- 
PHP Development Mailing List 
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-DEV] another segv in sapi_apache2

2001-08-17 Thread Doug MacEachern

thanks.  this one gets rid of a warning...

Index: sapi_apache2.c
===
RCS file: /repository/php4/sapi/apache2filter/sapi_apache2.c,v
retrieving revision 1.45
diff -u -r1.45 sapi_apache2.c
--- sapi_apache2.c  18 Aug 2001 01:36:29 -  1.45
+++ sapi_apache2.c  18 Aug 2001 01:55:32 -
@@ -238,7 +238,7 @@
}
 
 static int php_input_filter(ap_filter_t *f, apr_bucket_brigade *bb, 
-   ap_input_mode_t mode, apr_size_t *readbytes)
+   ap_input_mode_t mode, apr_off_t *readbytes)
 {
php_struct *ctx;
long old_index;




-- 
PHP Development Mailing List 
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]




Re: [PHP-DEV] another segv in sapi_apache2

2001-08-17 Thread Sterling Hughes

On Fri, 17 Aug 2001, Doug MacEachern wrote:

> doesn't seem right for this flush function to be called at server
> shutdown, ctx->f and ctx->f->r won't be alive at this point.  so i'm
> not sure if this is the right fix, but patch below stops segv.  with this
> and the cleanup_register patch bloom committed for me, all php tests in
> httpd-test are now passing under 2.0.  also working fine through mod_ssl
> (t/TEST -ssl)
>

Patch applied -- thanks :)

-Sterling

> #0  php_apache_sapi_flush (server_context=0x0) at sapi_apache2.c:175
> 175bb = apr_brigade_create(ctx->f->r->pool);
> (gdb) where
> #0  php_apache_sapi_flush (server_context=0x0) at sapi_apache2.c:175
> #1  0x40218eb6 in sapi_flush (tsrm_ls=0x8298040) at SAPI.c:559
> #2  0x40214e07 in php_module_shutdown (tsrm_ls=0x8298040) at main.c:994
> #3  0x40214dd1 in php_module_shutdown_wrapper (sapi_globals=0x402cf6a0)
> at main.c:973
> #4  0x40212b11 in php_apache_server_shutdown (tmp=0x0) at sapi_apache2.c:397
> #5  0x80e4d8c in run_cleanups (c=0x81e88b4) at apr_pools.c:771
> #6  0x80e4ed4 in apr_pool_clear (a=0x81e887c) at apr_pools.c:874
> #7  0x80e4f28 in apr_pool_destroy (a=0x81e887c) at apr_pools.c:920
> #8  0x80ba9ce in clean_child_exit (code=0) at prefork.c:236
> ...
>
> Index: sapi/apache2filter/sapi_apache2.c
> ===
> RCS file: /repository/php4/sapi/apache2filter/sapi_apache2.c,v
> retrieving revision 1.43
> diff -u -r1.43 sapi_apache2.c
> --- sapi/apache2filter/sapi_apache2.c   17 Aug 2001 22:25:13 - 1.43
> +++ sapi/apache2filter/sapi_apache2.c   18 Aug 2001 01:04:47 -
> @@ -163,6 +163,10 @@
> apr_bucket_brigade *bb;
> apr_bucket *b;
>
> +if (!server_context) {
> +return;
> +}
> +
> /* Send a flush bucket down the filter chain. The current default
>  * handler seems to act on the first flush bucket, but ignores
>  * all further flush buckets.
>
>
>
>


-- 
PHP Development Mailing List 
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]