projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix bug #64111
[m6w6/ext-http]
/
php_http_url.h
diff --git
a/php_http_url.h
b/php_http_url.h
index 4b7657c38967dfa36a809e2982677f878328da97..cc663acaa2edc7ae68487948807a851f648d84b2 100644
(file)
--- a/
php_http_url.h
+++ b/
php_http_url.h
@@
-41,10
+41,7
@@
PHP_HTTP_API STATUS php_http_url_encode_hash_ex(HashTable *ht, php_http_buffer_t
static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
{
static inline void php_http_url_argsep(const char **str, size_t *len TSRMLS_DC)
{
- *str = INI_STR("arg_separator.output");
- *len = strlen(*str);
-
- if (!*len) {
+ if (SUCCESS != php_http_ini_entry(ZEND_STRL("arg_separator.output"), str, len, 0 TSRMLS_CC) || !*len) {
*str = PHP_HTTP_URL_ARGSEP;
*len = lenof(PHP_HTTP_URL_ARGSEP);
}
*str = PHP_HTTP_URL_ARGSEP;
*len = lenof(PHP_HTTP_URL_ARGSEP);
}
@@
-153,8
+150,7
@@
static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS
return Z_ARRVAL(arr);
}
return Z_ARRVAL(arr);
}
-extern zend_class_entry *php_http_url_class_entry;
-extern zend_function_entry php_http_url_method_entry[];
+zend_class_entry *php_http_url_get_class_entry(void);
#define php_http_url_object_new php_http_object_new
#define php_http_url_object_new_ex php_http_object_new_ex
#define php_http_url_object_new php_http_object_new
#define php_http_url_object_new_ex php_http_object_new_ex
@@
-164,7
+160,7
@@
PHP_METHOD(HttpUrl, mod);
PHP_METHOD(HttpUrl, toString);
PHP_METHOD(HttpUrl, toArray);
PHP_METHOD(HttpUrl, toString);
PHP_METHOD(HttpUrl, toArray);
-
extern
PHP_MINIT_FUNCTION(http_url);
+PHP_MINIT_FUNCTION(http_url);
#endif
#endif