From: Ilia Alshanetsky <iliaa@php.net>
Date: Sat, 7 Mar 2009 22:36:42 +0000 (+0000)
Subject: MFB: Adjust previous fix to avoid compiler warnings
X-Git-Tag: php-5.4.0alpha1~191^2~4191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbe08731504e8de9d7099a1e95ee13ffb3bb5123;p=php

MFB: Adjust previous fix to avoid compiler warnings
---

diff --git a/sapi/apache_hooks/php_apache.c b/sapi/apache_hooks/php_apache.c
index 52bd180570..47a9553e76 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);