cvs: php-src /sapi/cgi cgi_main.c
| From: | Kalle Sommer Nielsen | Date: | Thu, 28 May 2009 20:47:01 +0000 |
| Subject: | cvs: php-src /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-58364@lists.php.net to get a copy of this message | ||
kalle Thu May 28 20:47:01 2009 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
Fix compiler warnings introduced by the JIT commit
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.380&r2=1.381&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.380 php-src/sapi/cgi/cgi_main.c:1.381
--- php-src/sapi/cgi/cgi_main.c:1.380 Sat May 23 18:59:17 2009
+++ php-src/sapi/cgi/cgi_main.c Thu May 28 20:47:01 2009
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.380 2009/05/23 18:59:17 jani Exp $ */
+/* $Id: cgi_main.c,v 1.381 2009/05/28 20:47:01 kalle Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -625,9 +625,7 @@
zend_hash_get_current_data_ex(request->env, (void **) &val, &pos) == SUCCESS;
zend_hash_move_forward_ex(request->env, &pos)
) {
- unsigned int new_val_len;
-
- if (php_register_variable_with_conv(conv, var.s, strlen(var.s), val, strlen(*val), array_ptr,
filter_arg TSRMLS_CC) == FAILURE) {
+ if (php_register_variable_with_conv(conv, var.s, strlen(var.s), *val, strlen(*val), array_ptr,
filter_arg TSRMLS_CC) == FAILURE) {
php_error(E_WARNING, "Failed to decode %s array entry", (filter_arg ==
PARSE_ENV?"_ENV":"_SERVER"));
}
}