Improved parameter handling

diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 86e43962dd6d6ea37f8880ccead775af4c1c60e8..a3677b80f2b6a425a64136d3a4b5685d52532403 100644 (file)
--- a/sapi/apache_hooks/php_apache.c
+++ b/sapi/apache_hooks/php_apache.c
@@ -713,7 +713,7 @@ PHP_FUNCTION(apache_request_server_port)
 PHP_FUNCTION(apache_request_remote_host)
 {
        zval *id;
-       long ztype;
+       long ztype = NULL;
        request_rec *r;
        char *res;
        int type = REMOTE_NAME;
@@ -722,15 +722,10 @@ PHP_FUNCTION(apache_request_remote_host)
                return;
        }
 
-       switch (ZEND_NUM_ARGS()) {
-               case 0:
-                       break;
-               case 1:
-                       type = ztype;
-                       break;
+       if (ztype) {
+               type = ztype;
        }
 
-
        APREQ_GET_REQUEST(id, r);
 
        res = (char *)ap_get_remote_host(r->connection, r->per_dir_config, type);