projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
update travis/pecl
[m6w6/ext-http]
/
src
/
php_http_querystring.c
diff --git
a/src/php_http_querystring.c
b/src/php_http_querystring.c
index d45cd49923b21ce2b17746ddf0f56b84765b8fc8..01d95f9f0ec91bd210fd2b15335a4fecc3cffac0 100644
(file)
--- a/
src/php_http_querystring.c
+++ b/
src/php_http_querystring.c
@@
-12,15
+12,15
@@
#include "php_http_api.h"
#include "php_http_api.h"
-#include
<php_variables.h>
-#include
<ext/spl/spl_array.h>
+#include
"php_variables.h"
+#include
"ext/spl/spl_array.h"
#ifdef PHP_HTTP_HAVE_ICONV
# ifndef HAVE_ICONV
# define HAVE_ICONV 1
# endif
# undef PHP_ATOM_INC
#ifdef PHP_HTTP_HAVE_ICONV
# ifndef HAVE_ICONV
# define HAVE_ICONV 1
# endif
# undef PHP_ATOM_INC
-# include
<ext/iconv/php_iconv.h>
+# include
"ext/iconv/php_iconv.h"
#endif
static zend_class_entry *php_http_querystring_class_entry;
#endif
static zend_class_entry *php_http_querystring_class_entry;
@@
-160,7
+160,7
@@
static int apply_querystring(zval *val)
zval *zvalue;
if ((zvalue = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("value")))) {
zval *zvalue;
if ((zvalue = zend_hash_str_find(Z_ARRVAL_P(val), ZEND_STRL("value")))) {
- zval tmp;
+ zval tmp
= {0}
;
ZVAL_COPY(&tmp, zvalue);
zval_dtor(val);
ZVAL_COPY(&tmp, zvalue);
zval_dtor(val);
@@
-289,25
+289,24
@@
ZEND_RESULT_CODE php_http_querystring_update(zval *qarray, zval *params, zval *o
/*
* update
*/
/*
* update
*/
- zval equal, tmp, *entry =
&tmp
;
+ zval equal, tmp, *entry =
NULL
;
ZVAL_UNDEF(&tmp);
/* recursive */
if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) {
ZVAL_UNDEF(&tmp);
/* recursive */
if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) {
- ZVAL_DUP(entry, qarray_entry);
- convert_to_array(entry);
- php_http_querystring_update(entry, params_entry, NULL);
+ ZVAL_DUP(&tmp, qarray_entry);
+ convert_to_array(&tmp);
+ php_http_querystring_update(&tmp, params_entry, NULL);
+ entry = &tmp;
} else if ((FAILURE == is_identical_function(&equal, qarray_entry, params_entry)) || Z_TYPE(equal) != IS_TRUE) {
Z_TRY_ADDREF_P(params_entry);
entry = params_entry;
}
} else if ((FAILURE == is_identical_function(&equal, qarray_entry, params_entry)) || Z_TYPE(equal) != IS_TRUE) {
Z_TRY_ADDREF_P(params_entry);
entry = params_entry;
}
- if (entry) {
- if (key.key) {
- zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry);
- } else {
- zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry);
- }
+ if (key.key) {
+ zend_hash_update(Z_ARRVAL_P(qarray), key.key, entry ? entry : &tmp);
+ } else {
+ zend_hash_index_update(Z_ARRVAL_P(qarray), key.h, entry ? entry : &tmp);
}
} else {
zval entry, *entry_ptr = &entry;
}
} else {
zval entry, *entry_ptr = &entry;