diff options
| author | Sterling Hughes <sterling@php.net> | 2001-11-29 11:29:11 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2001-11-29 11:29:11 +0000 |
| commit | d30044c969defa4d04b5aef00eac93e23329c66c (patch) | |
| tree | 65d05a1f033144587c593ccaeb9192d0c4177e5d /sapi | |
| parent | 3ee263e3482c79525f864f9a0f378382e8cac51f (diff) | |
| download | php-git-d30044c969defa4d04b5aef00eac93e23329c66c.tar.gz | |
Update to the latest apr api (patch by Clif Woolley)
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/apache2filter/sapi_apache2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c index f08f483099..0488942acc 100644 --- a/sapi/apache2filter/sapi_apache2.c +++ b/sapi/apache2filter/sapi_apache2.c @@ -145,7 +145,7 @@ static void php_apache_sapi_register_variables(zval *track_vars_array TSRMLS_DC) { php_struct *ctx = SG(server_context); - apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env); + const apr_array_header_t *arr = apr_table_elts(ctx->f->r->subprocess_env); char *key, *val; APR_ARRAY_FOREACH_OPEN(arr, key, val) @@ -419,7 +419,7 @@ static void php_apache_add_version(apr_pool_t *p) } } -static void +static int php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s) { @@ -429,6 +429,8 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_cleanup_register(pconf, NULL, php_apache_server_shutdown, apr_pool_cleanup_null); php_apache_register_module(); php_apache_add_version(pconf); + + return OK; } static void php_add_filter(request_rec *r, ap_filter_t *f) |