branch off v1 as R_1_7

[m6w6/ext-http] / php_http_url_api.h

diff --git a/php_http_url_api.h b/php_http_url_api.h
index fbb4ae1c991b020c74bda4a67975a1c532d88e44..940db8e61e68e1a544896a691079ad33c5b633ff 100644 (file)
--- a/php_http_url_api.h
+++ b/php_http_url_api.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -19,15 +19,16 @@
 
 extern PHP_MINIT_FUNCTION(http_url);
 
-#define http_absolute_url(u) _http_absolute_url((u) TSRMLS_CC)
-PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC);
+#define http_absolute_url(u) _http_absolute_url_ex((u), HTTP_URL_REPLACE TSRMLS_CC)
+#define http_absolute_url_ex(u, f) _http_absolute_url_ex((u), (f) TSRMLS_CC)
+PHP_HTTP_API char *_http_absolute_url_ex(const char *url, int flags TSRMLS_DC);
 
 #define HTTP_URL_REPLACE               0x000
 #define HTTP_URL_JOIN_PATH             0x001
 #define HTTP_URL_JOIN_QUERY            0x002
 #define HTTP_URL_STRIP_USER            0x004
 #define HTTP_URL_STRIP_PASS            0x008
-#define HTTP_URL_STRIP_AUTH            0x010
+#define HTTP_URL_STRIP_AUTH            (HTTP_URL_STRIP_USER|HTTP_URL_STRIP_PASS)
 #define HTTP_URL_STRIP_PORT            0x020
 #define HTTP_URL_STRIP_PATH            0x040
 #define HTTP_URL_STRIP_QUERY   0x080
@@ -39,6 +40,7 @@ PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC);
        HTTP_URL_STRIP_QUERY | \
        HTTP_URL_STRIP_FRAGMENT \
 )
+#define HTTP_URL_FROM_ENV              0x1000
 
 #define http_build_url(f, o, n, p, s, l) _http_build_url((f), (o), (n), (p), (s), (l) TSRMLS_CC)
 PHP_HTTP_API void _http_build_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);
@@ -91,11 +93,10 @@ static inline php_url *_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_
                if (Z_TYPE_PP(e) == IS_LONG) {
                        url->port = (unsigned short) Z_LVAL_PP(e);
                } else {
-                       zval *o = *e;
+                       zval *o = http_zsep(IS_LONG, *e);
                        
-                       convert_to_long_ex(e);
-                       url->port = (unsigned short) Z_LVAL_PP(e);
-                       if (o != *e) zval_ptr_dtor(e);
+                       url->port = (unsigned short) Z_LVAL_P(o);
+                       zval_ptr_dtor(&o);
                }
        }
        
@@ -108,8 +109,7 @@ static inline HashTable *_http_url_tostruct(php_url *url, zval *strct TSRMLS_DC)
        zval arr;
        
        if (strct) {
-               switch (Z_TYPE_P(strct))
-               {
+               switch (Z_TYPE_P(strct)) {
                        default:
                                zval_dtor(strct);
                                array_init(strct);