X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_querystring.c;h=364d2ee6bf637f7a24c1e1d2d3c8f232e4908a7c;hp=ab2bc3d384c89099cc301f3a8d7882d1f9305f72;hb=20a7c37b273e313e53a37f4406eb49898dd50b6d;hpb=4743c5114bcdcf8d478e140beb63fecfeccd01a4 diff --git a/php_http_querystring.c b/php_http_querystring.c index ab2bc3d..364d2ee 100644 --- a/php_http_querystring.c +++ b/php_http_querystring.c @@ -6,12 +6,10 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2011, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id$ */ - #include "php_http.h" #include
@@ -350,7 +348,7 @@ static inline void php_http_querystring_get(zval *this_ptr, int type, char *name { zval **arrval, *qarray = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); - if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) { + if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_symtable_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) { if (type) { zval *value = php_http_ztyp(type, *arrval); RETVAL_ZVAL(value, 1, 1); @@ -599,7 +597,7 @@ PHP_METHOD(HttpQueryString, offsetGet) zval *qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); if (Z_TYPE_P(qa) == IS_ARRAY - && SUCCESS == zend_hash_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value) + && SUCCESS == zend_symtable_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value) ) { RETVAL_ZVAL(*value, 1, 0); } @@ -634,7 +632,7 @@ PHP_METHOD(HttpQueryString, offsetExists) zval *qa = zend_read_property(php_http_querystring_class_entry, getThis(), ZEND_STRL("queryArray"), 0 TSRMLS_CC); if (Z_TYPE_P(qa) == IS_ARRAY - && SUCCESS == zend_hash_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value) + && SUCCESS == zend_symtable_find(Z_ARRVAL_P(qa), offset_str, offset_len + 1, (void *) &value) && Z_TYPE_PP(value) != IS_NULL ) { RETURN_TRUE;