archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make Apache 2.0 filter build again

Browse source
This commit is contained in:
Sascha Schumann 2001-01-08 23:18:47 +00:00
parent 7fbc93d57f
commit 426d4104ea
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/apache2filter/php_functions.c
View file

@ -46,7 +46,7 @@ static request_rec *php_apache_lookup_uri(INTERNAL_FUNCTION_PARAMETERS)
convert_to_string_ex(p1); convert_to_string_ex(p1);
ctx = SG(server_context); ctx = SG(server_context);
return ap_sub_req_lookup_uri(Z_STRVAL_PP(p1), ctx->f->r); return ap_sub_req_lookup_uri(Z_STRVAL_PP(p1), ctx->f->r, NULL);
} }
PHP_FUNCTION(apache_sub_req) PHP_FUNCTION(apache_sub_req)

3
sapi/apache2filter/sapi_apache2.c
View file

@ -430,7 +430,7 @@ static void
php_apache_server_startup(apr_pool_t *pchild, server_rec *s) php_apache_server_startup(apr_pool_t *pchild, server_rec *s)
{ {
tsrm_startup(1, 1, 0, NULL); tsrm_startup(1, 1, 0, NULL);
sapi_startup(&apache1_sapi_module); sapi_startup(&apache2_sapi_module);
apache2_sapi_module.startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module);
apr_register_cleanup(pchild, NULL, php_apache_server_shutdown, NULL); apr_register_cleanup(pchild, NULL, php_apache_server_shutdown, NULL);
php_apache_register_module(); php_apache_register_module();
@ -450,6 +450,5 @@ module MODULE_VAR_EXPORT php4_module = {
NULL, /* create per-server config structure */ NULL, /* create per-server config structure */
NULL, /* merge per-server config structures */ NULL, /* merge per-server config structures */
php_dir_cmds, /* command apr_table_t */ php_dir_cmds, /* command apr_table_t */
NULL, /* handlers */
php_register_hook /* register hooks */ php_register_hook /* register hooks */
}; };