cvs: php4 /sapi/apache2filter php_functions.c sapi_apache2.c

sas Mon Jan 8 15:18:47 2001 EDT Modified files: /php4/sapi/apache2filter php_functions.c sapi_apache2.c Log: Make Apache 2.0 filter build again Index: php4/sapi/apache2filter/php_functions.c diff -u php4/sapi/apache2filter/php_functions.c:1.4 php4/sapi/apache2filter/php_functions.c:1.5 --- php4/sapi/apache2filter/php_functions.c:1.4 Sat Nov 11 10:24:27 2000 +++ php4/sapi/apache2filter/php_functions.c Mon Jan 8 15:18:46 2001 @@ -46,7 +46,7 @@ convert_to_string_ex(p1); 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) Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.23 php4/sapi/apache2filter/sapi_apache2.c:1.24 --- php4/sapi/apache2filter/sapi_apache2.c:1.23 Tue Jan 2 14:49:28 2001 +++ php4/sapi/apache2filter/sapi_apache2.c Mon Jan 8 15:18:47 2001 @@ -430,7 +430,7 @@ php_apache_server_startup(apr_pool_t *pchild, server_rec *s) { tsrm_startup(1, 1, 0, NULL); - sapi_startup(&apache1_sapi_module); + sapi_startup(&apache2_sapi_module); apache2_sapi_module.startup(&apache2_sapi_module); apr_register_cleanup(pchild, NULL, php_apache_server_shutdown, NULL); php_apache_register_module(); @@ -450,6 +450,5 @@ NULL, /* create per-server config structure */ NULL, /* merge per-server config structures */ php_dir_cmds, /* command apr_table_t */ - NULL, /* handlers */ php_register_hook /* register hooks */ };