cvs: php-src /sapi/apache_hooks php_apache.c
| From: | Ilia Alshanetsky | Date: | Sat, 07 Mar 2009 22:36:42 +0000 |
| Subject: | cvs: php-src /sapi/apache_hooks php_apache.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56441@lists.php.net to get a copy of this message | ||
iliaa Sat Mar 7 22:36:42 2009 UTC
Modified files:
/php-src/sapi/apache_hooks php_apache.c
Log:
MFB: Adjust previous fix to avoid compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache_hooks/php_apache.c?r1=1.43&r2=1.44&diff_format=u
Index: php-src/sapi/apache_hooks/php_apache.c
diff -u php-src/sapi/apache_hooks/php_apache.c:1.43 php-src/sapi/apache_hooks/php_apache.c:1.44
--- php-src/sapi/apache_hooks/php_apache.c:1.43 Sat Mar 7 21:56:52 2009
+++ php-src/sapi/apache_hooks/php_apache.c Sat Mar 7 22:36:42 2009
@@ -17,7 +17,7 @@
| David Sklar <sklar@student.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.43 2009/03/07 21:56:52 iliaa Exp $ */
+/* $Id: php_apache.c,v 1.44 2009/03/07 22:36:42 iliaa Exp $ */
#include "php_apache_http.h"
@@ -713,22 +713,21 @@
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);