X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.h;h=a482d2382184f8269015cf7a788df166c32059a6;hp=23f529dfa3ddc91caceb69d52839aee46d49bdfd;hb=bd80b17b026a00a254ee8693cd7bacf1ebdec4cf;hpb=dedad9f35cbeaee56e7cca145e378cc6548198e3 diff --git a/php_http_url.h b/php_http_url.h index 23f529d..a482d23 100644 --- a/php_http_url.h +++ b/php_http_url.h @@ -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: php_http_url_api.h 292841 2009-12-31 08:48:57Z mike $ */ - #ifndef PHP_HTTP_URL_H #define PHP_HTTP_URL_H @@ -37,7 +35,6 @@ #define PHP_HTTP_URL_FROM_ENV 0x1000 PHP_HTTP_API void php_http_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC); -PHP_HTTP_API char *php_http_url_absolute(const char *url, int flags TSRMLS_DC); PHP_HTTP_API STATUS php_http_url_encode_hash(HashTable *hash, const char *pre_encoded_str, size_t pre_encoded_len, char **encoded_str, size_t *encoded_len TSRMLS_DC); PHP_HTTP_API STATUS php_http_url_encode_hash_ex(HashTable *ht, php_http_buffer_t *str, const char *arg_sep_str, size_t arg_sep_len, const char *val_sep_str, size_t val_sep_len, const char *prefix_str, size_t prefix_len TSRMLS_DC); @@ -115,9 +112,11 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS default: zval_dtor(strct); array_init(strct); + /* no break */ case IS_ARRAY: case IS_OBJECT: INIT_PZVAL_ARRAY((&arr), HASH_OF(strct)); + break; } } else { INIT_PZVAL(&arr); @@ -154,16 +153,17 @@ static inline HashTable *php_http_url_to_struct(php_url *url, zval *strct TSRMLS 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 PHP_METHOD(HttpUrl, __construct); +PHP_METHOD(HttpUrl, mod); PHP_METHOD(HttpUrl, toString); +PHP_METHOD(HttpUrl, toArray); -extern PHP_MINIT_FUNCTION(http_url); +PHP_MINIT_FUNCTION(http_url); #endif