cvs: php-src(PHP_5_3) /sapi/apache_hooks php_apache.c
| From: | Pierre-Alain Joye | Date: | Mon, 16 Mar 2009 09:59:16 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /sapi/apache_hooks php_apache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56531@lists.php.net to get a copy of this message | ||
pajoye Mon Mar 16 09:59:16 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/apache_hooks php_apache.c
Log:
- fix vc6 build
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.19.2.3.2.5.2.15&r2=1.19.2.3.2.5.2.16&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.15
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.15 Sat Mar 7 22:36:35 2009
+++ php-src/sapi/apache_hooks/php_apache.c Mon Mar 16 09:59:16 2009
@@ -17,7 +17,7 @@
| David Sklar <sklar@student.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.19.2.3.2.5.2.15 2009/03/07 22:36:35 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.19.2.3.2.5.2.16 2009/03/16 09:59:16 pajoye Exp $ */
#include "php_apache_http.h"
@@ -713,21 +713,23 @@
PHP_FUNCTION(apache_request_remote_host)
{
zval *id;
- long type = 0;
+ long ztype;
request_rec *r;
char *res;
+ int type = REMOTE_NAME;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &type) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &ztype) == FAILURE) {
return;
}
- if (!type) {
- type = REMOTE_NAME
+ if (ZEND_NUM_ARGS() == 1) {
+ type = ztype;
}
+
APREQ_GET_REQUEST(id, r);
- res = (char *)ap_get_remote_host(r->connection, r->per_dir_config, (int)type);
+ res = (char *)ap_get_remote_host(r->connection, r->per_dir_config, type);
if (res) {
RETURN_STRING(res, 1);