diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2009-03-07 22:36:35 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2009-03-07 22:36:35 +0000 |
| commit | 5e09a71769390c469c287baa0c4b04a429ca0b34 (patch) | |
| tree | 072d41b09b9e1c1c39cacdb0bc3d33c72ffced73 /sapi/apache_hooks/php_apache.c | |
| parent | 9d3030d5f367729197756c7ecb4feab713850bf6 (diff) | |
| download | php-git-5e09a71769390c469c287baa0c4b04a429ca0b34.tar.gz | |
Adjust previous fix to avoid compiler warnings
Diffstat (limited to 'sapi/apache_hooks/php_apache.c')
| -rw-r--r-- | sapi/apache_hooks/php_apache.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c index a3677b80f2..e6b61bb9b9 100644 --- a/sapi/apache_hooks/php_apache.c +++ b/sapi/apache_hooks/php_apache.c @@ -713,22 +713,21 @@ PHP_FUNCTION(apache_request_server_port) PHP_FUNCTION(apache_request_remote_host) { zval *id; - long ztype = NULL; + long type = 0; request_rec *r; char *res; - int type = REMOTE_NAME; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &ztype) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &type) == FAILURE) { return; } - if (ztype) { - type = ztype; + if (!type) { + type = REMOTE_NAME } APREQ_GET_REQUEST(id, r); - res = (char *)ap_get_remote_host(r->connection, r->per_dir_config, type); + res = (char *)ap_get_remote_host(r->connection, r->per_dir_config, (int)type); if (res) { RETURN_STRING(res, 1); |