Make Apache 2.0 filter build again

diff --git a/sapi/apache2filter/php_functions.c b/sapi/apache2filter/php_functions.c
index fd17d179998216c4d94548263209ee7e96470709..fd9f440110fa674c263dbbdf9398135328eec0c9 100644 (file)
--- a/sapi/apache2filter/php_functions.c
+++ b/sapi/apache2filter/php_functions.c
@@ -46,7 +46,7 @@ static request_rec *php_apache_lookup_uri(INTERNAL_FUNCTION_PARAMETERS)
        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)

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 04c7cad836ac0a05a6075cc1dcb011ad8e426921..196d9c9cf83b1ab0a40bf21319dbd88cef7e4c4b 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -430,7 +430,7 @@ static void
 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 @@ module MODULE_VAR_EXPORT php4_module = {
     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 */
 };