projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests
[m6w6/ext-http]
/
php_http_querystring.c
diff --git
a/php_http_querystring.c
b/php_http_querystring.c
index d77bbdaceccfc5bdf1ac586527b14af8c9a47797..7c569de763b31414157d01e6c23f27c362a29cda 100644
(file)
--- a/
php_http_querystring.c
+++ b/
php_http_querystring.c
@@
-6,17
+6,14
@@
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-201
0
, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-201
1
, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
+--------------------------------------------------------------------+
*/
-/* $Id$ */
+#include "php_http_api.h"
-#include "php_http.h"
-
-#include <main/php_variables.h>
+#include <php_variables.h>
#include <ext/spl/spl_array.h>
#include <ext/spl/spl_array.h>
-#include <Zend/zend_interfaces.h>
#ifdef PHP_HTTP_HAVE_ICONV
# undef PHP_ATOM_INC
#ifdef PHP_HTTP_HAVE_ICONV
# undef PHP_ATOM_INC
@@
-148,23
+145,22
@@
PHP_HTTP_API STATUS php_http_querystring_update(zval *qarray, zval *params, zval
}
}
} else {
}
}
} else {
+ zval *entry;
/*
* add
*/
if (Z_TYPE_PP(params_entry) == IS_OBJECT) {
/*
* add
*/
if (Z_TYPE_PP(params_entry) == IS_OBJECT) {
- zval *new_array;
-
- MAKE_STD_ZVAL(new_array);
- array_init(new_array);
- php_http_querystring_update(new_array, *params_entry, NULL TSRMLS_CC);
- *params_entry = new_array;
+ MAKE_STD_ZVAL(entry);
+ array_init(entry);
+ php_http_querystring_update(entry, *params_entry, NULL TSRMLS_CC);
} else {
Z_ADDREF_PP(params_entry);
} else {
Z_ADDREF_PP(params_entry);
+ entry = *params_entry;
}
if (key.type == HASH_KEY_IS_STRING) {
}
if (key.type == HASH_KEY_IS_STRING) {
- add_assoc_zval_ex(qarray, key.str, key.len,
*params_
entry);
+ add_assoc_zval_ex(qarray, key.str, key.len, entry);
} else {
} else {
- add_index_zval(qarray, key.num,
*params_
entry);
+ add_index_zval(qarray, key.num, entry);
}
}
}
}
}
}