cvs: php-src(PHP_5_3) /sapi/apache_hooks php_apache.c

pajoye Mon Mar 16 10:08:51 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/apache_hooks php_apache.c Log: - revert last commit (tree was not updated) http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.16&r2=1.19.2.3.2.5.2.17&diff_format=u Index: php-src/sapi/apache_hooks/php_apache.c diff -u php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.16 php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.17 --- php-src/sapi/apache_hooks/php_apache.c:1.19.2.3.2.5.2.16 Mon Mar 16 09:59:16 2009 +++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 16 10:08:51 2009 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.19.2.3.2.5.2.16 2009/03/16 09:59:16 pajoye Exp $ */ +/* $Id: php_apache.c,v 1.19.2.3.2.5.2.17 2009/03/16 10:08:51 pajoye Exp $ */ #include "php_apache_http.h" @@ -713,23 +713,21 @@ PHP_FUNCTION(apache_request_remote_host) { zval *id; - long ztype; + 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 (ZEND_NUM_ARGS() == 1) { - 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);