projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- typo
[m6w6/ext-http]
/
http_querystring_object.c
diff --git
a/http_querystring_object.c
b/http_querystring_object.c
index 7db43decc0784f98142f245c18367f14723a9e09..580ae6bf38d9639aa277a226c2fd9339248a7535 100644
(file)
--- a/
http_querystring_object.c
+++ b/
http_querystring_object.c
@@
-61,7
+61,7
@@
HTTP_BEGIN_ARGS(__getter, 1)
HTTP_ARG_VAL(delete, 0)
HTTP_END_ARGS;
HTTP_ARG_VAL(delete, 0)
HTTP_END_ARGS;
-#if
def HAVE_ICONV
+#if
HTTP_HAVE_EXT(ICONV)
HTTP_BEGIN_ARGS(xlate, 2)
HTTP_ARG_VAL(from_encoding, 0)
HTTP_ARG_VAL(to_encoding, 0)
HTTP_BEGIN_ARGS(xlate, 2)
HTTP_ARG_VAL(from_encoding, 0)
HTTP_ARG_VAL(to_encoding, 0)
@@
-95,7
+95,7
@@
zend_function_entry http_querystring_object_fe[] = {
#ifndef WONKY
HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
#endif
#ifndef WONKY
HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
#endif
-#if
def HAVE_ICONV
+#if
HTTP_HAVE_EXT(ICONV)
HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
#endif
HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC)
#endif
@@
-327,8
+327,7
@@
PHP_METHOD(HttpQueryString, get)
if (Z_TYPE_P(ztype) == IS_LONG) {
type = Z_LVAL_P(ztype);
} else if(Z_TYPE_P(ztype) == IS_STRING) {
if (Z_TYPE_P(ztype) == IS_LONG) {
type = Z_LVAL_P(ztype);
} else if(Z_TYPE_P(ztype) == IS_STRING) {
- switch (Z_STRVAL_P(ztype)[0])
- {
+ switch (Z_STRVAL_P(ztype)[0]) {
case 'B':
case 'b': type = HTTP_QUERYSTRING_TYPE_BOOL; break;
case 'I':
case 'B':
case 'b': type = HTTP_QUERYSTRING_TYPE_BOOL; break;
case 'I':
@@
-432,7
+431,7
@@
HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY);
HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
/* }}} */
HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT);
/* }}} */
-#if
def HAVE_ICONV
+#if
HTTP_HAVE_EXT(ICONV)
/* {{{ proto bool HttpQueryString::xlate(string ie, string oe)
*
* Converts the query string from the source encoding ie to the target encoding oe.
/* {{{ proto bool HttpQueryString::xlate(string ie, string oe)
*
* Converts the query string from the source encoding ie to the target encoding oe.