cvs: php-src /sapi/apache_hooks php_apache.c
| From: | Ilia Alshanetsky | Date: | Sat, 07 Mar 2009 21:56:52 +0000 |
| Subject: | cvs: php-src /sapi/apache_hooks php_apache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56436@lists.php.net to get a copy of this message | ||
iliaa Sat Mar 7 21:56:52 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
MFB: Improved parameter handling
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.42&r2=1.43&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.42 php-src/sapi/apache_hooks/php_apache.c:1.43
--- php-src/sapi/apache_hooks/php_apache.c:1.42 Mon Feb 2 08:47:09 2009
+++ php-src/sapi/apache_hooks/php_apache.c Sat Mar 7 21:56:52 2009
@@ -17,7 +17,7 @@
| David Sklar <sklar@student.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.42 2009/02/02 08:47:09 pajoye Exp $ */
+/* $Id: php_apache.c,v 1.43 2009/03/07 21:56:52 iliaa Exp $ */
#include "php_apache_http.h"
@@ -713,7 +713,7 @@
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 @@
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);