- don't use environment for constructing request urls and

  introduce HTTP_URL_FROM_ENV which is added to the default
  flags of http_build_url()

diff --git a/http_functions.c b/http_functions.c
index d915b3f832e2cda66de129102afd397686c9f4b7..1f94df95a317757f252acb79f417cfe69acdced2 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -56,13 +56,13 @@ PHP_FUNCTION(http_date)
 }
 /* }}} */
 
 }
 /* }}} */
 

-/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]])
+/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV[, array &new_url]]]])

        Build an URL. */
 PHP_FUNCTION(http_build_url)
 {
        char *url_str = NULL;
        size_t url_len = 0;
        Build an URL. */
 PHP_FUNCTION(http_build_url)
 {
        char *url_str = NULL;
        size_t url_len = 0;

-       long flags = HTTP_URL_REPLACE;
+       long flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV;

        zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL;
        php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL;
 
        zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL;
        php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL;
 


@@ -492,7 +492,7 @@ PHP_FUNCTION(http_redirect)
                }
        }
 
                }
        }
 

-       URI = http_absolute_url(url);
+       URI = http_absolute_url_ex(url, HTTP_URL_FROM_ENV);

 
        if (query_len) {
                spprintf(&LOC, 0, "Location: %s?%s", URI, query);
 
        if (query_len) {
                spprintf(&LOC, 0, "Location: %s?%s", URI, query);

diff --git a/http_url_api.c b/http_url_api.c
index 30db604274ca4b3a7b8d9ef62998c6e6a4d17e20..f67d91a3e40a1a66773f3f9c2095e642a3e008f6 100644 (file)
--- a/http_url_api.c
+++ b/http_url_api.c
@@ -51,7 +51,7 @@ static inline char *localhostname(void)
                }
        }
 #endif
                }
        }
 #endif

-       return estrdup("localhost");
+       return estrndup("localhost", lenof("localhost"));

 }
 
 PHP_MINIT_FUNCTION(http_url)
 }
 
 PHP_MINIT_FUNCTION(http_url)


@@ -67,10 +67,11 @@ PHP_MINIT_FUNCTION(http_url)
        HTTP_LONG_CONSTANT("HTTP_URL_STRIP_QUERY", HTTP_URL_STRIP_QUERY);
        HTTP_LONG_CONSTANT("HTTP_URL_STRIP_FRAGMENT", HTTP_URL_STRIP_FRAGMENT);
        HTTP_LONG_CONSTANT("HTTP_URL_STRIP_ALL", HTTP_URL_STRIP_ALL);
        HTTP_LONG_CONSTANT("HTTP_URL_STRIP_QUERY", HTTP_URL_STRIP_QUERY);
        HTTP_LONG_CONSTANT("HTTP_URL_STRIP_FRAGMENT", HTTP_URL_STRIP_FRAGMENT);
        HTTP_LONG_CONSTANT("HTTP_URL_STRIP_ALL", HTTP_URL_STRIP_ALL);

+       HTTP_LONG_CONSTANT("HTTP_URL_FROM_ENV", HTTP_URL_FROM_ENV);

        return SUCCESS;
 }
 
        return SUCCESS;
 }
 

-PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
+PHP_HTTP_API char *_http_absolute_url_ex(const char *url, int flags TSRMLS_DC)

 {
        char *abs = NULL;
        php_url *purl = NULL;
 {
        char *abs = NULL;
        php_url *purl = NULL;


@@ -84,7 +85,7 @@ PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC)
                }
        }
        
                }
        }
        

-       http_build_url(0, purl, NULL, NULL, &abs, NULL);
+       http_build_url(flags, purl, NULL, NULL, &abs, NULL);

        
        if (purl) {
                php_url_free(purl);
        
        if (purl) {
                php_url_free(purl);


@@ -107,7 +108,7 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
        url->n = __URLSET(new_url,n) ? estrdup(new_url->n) : (__URLSET(old_url,n) ? estrdup(old_url->n) : NULL)
        
        if (!(flags & HTTP_URL_STRIP_PORT)) {
        url->n = __URLSET(new_url,n) ? estrdup(new_url->n) : (__URLSET(old_url,n) ? estrdup(old_url->n) : NULL)
        
        if (!(flags & HTTP_URL_STRIP_PORT)) {

-               url->port = (new_url&&new_url->port) ? new_url->port : ((old_url) ? old_url->port : 0);
+               url->port = __URLSET(new_url, port) ? new_url->port : ((old_url) ? old_url->port : 0);

        }
        if (!(flags & HTTP_URL_STRIP_USER)) {
                __URLCPY(user);
        }
        if (!(flags & HTTP_URL_STRIP_USER)) {
                __URLCPY(user);


@@ -161,46 +162,54 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
        }
        
        if (!url->scheme) {
        }
        
        if (!url->scheme) {

-               zval *https = http_get_server_var("HTTPS", 1);
-               if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
-                       url->scheme = estrndup("https", lenof("https"));
-               } else switch (url->port) {
-                       case 443:
+               if (flags & HTTP_URL_FROM_ENV) {
+                       zval *https = http_get_server_var("HTTPS", 1);
+                       if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {

                                url->scheme = estrndup("https", lenof("https"));
                                url->scheme = estrndup("https", lenof("https"));

-                               break;
+                       } else switch (url->port) {
+                               case 443:
+                                       url->scheme = estrndup("https", lenof("https"));
+                                       break;

 
 #ifndef HAVE_GETSERVBYPORT
 
 #ifndef HAVE_GETSERVBYPORT

-                       default:
+                               default:

 #endif
 #endif

-                       case 80:
-                               url->scheme = estrndup("http", lenof("http"));
-                               break;
+                               case 80:
+                                       url->scheme = estrndup("http", lenof("http"));
+                                       break;

                        
 #ifdef HAVE_GETSERVBYPORT
                        
 #ifdef HAVE_GETSERVBYPORT

-                       default:
-                               if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) {
-                                       url->scheme = estrdup(se->s_name);
-                               } else {
-                                       url->scheme = estrndup("http", lenof("http"));
-                               }
-                               break;
+                               default:
+                                       if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) {
+                                               url->scheme = estrdup(se->s_name);
+                                       } else {
+                                               url->scheme = estrndup("http", lenof("http"));
+                                       }
+                                       break;

 #endif
 #endif

+                       }
+               } else {
+                       url->scheme = estrndup("http", lenof("http"));

                }
        }
 
        if (!url->host) {
                }
        }
 
        if (!url->host) {

-               zval *zhost;
-               
-               if ((((zhost = http_get_server_var("HTTP_HOST", 1)) || 
-                               (zhost = http_get_server_var("SERVER_NAME", 1)))) && Z_STRLEN_P(zhost)) {
-                       url->host = estrndup(Z_STRVAL_P(zhost), Z_STRLEN_P(zhost));
+               if (flags & HTTP_URL_FROM_ENV) {
+                       zval *zhost;
+                       
+                       if ((((zhost = http_get_server_var("HTTP_HOST", 1)) || 
+                                       (zhost = http_get_server_var("SERVER_NAME", 1)))) && Z_STRLEN_P(zhost)) {
+                               url->host = estrndup(Z_STRVAL_P(zhost), Z_STRLEN_P(zhost));
+                       } else {
+                               url->host = localhostname();
+                       }

                } else {
                } else {

-                       url->host = localhostname();
+                       url->host = estrndup("localhost", lenof("localhost"));

                }
        }
        
        if (!url->path) {
                }
        }
        
        if (!url->path) {

-               if (SG(request_info).request_uri && SG(request_info).request_uri[0]) {
+               if ((flags & HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) {

                        const char *q = strchr(SG(request_info).request_uri, '?');
                        
                        if (q) {
                        const char *q = strchr(SG(request_info).request_uri, '?');
                        
                        if (q) {


@@ -212,7 +221,7 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
                        url->path = estrndup("/", 1);
                }
        } else if (url->path[0] != '/') {
                        url->path = estrndup("/", 1);
                }
        } else if (url->path[0] != '/') {

-               if (SG(request_info).request_uri && SG(request_info).request_uri[0]) {
+               if ((flags & HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) {

                        size_t ulen = strlen(SG(request_info).request_uri);
                        size_t plen = strlen(url->path);
                        char *path;
                        size_t ulen = strlen(SG(request_info).request_uri);
                        size_t plen = strlen(url->path);
                        char *path;

diff --git a/php_http_url_api.h b/php_http_url_api.h
index 84ee4141c316cdbca44fa8e92f689a6595c7c185..70c1aae867093b587305e1524c32b347d3bace5f 100644 (file)
--- a/php_http_url_api.h
+++ b/php_http_url_api.h
@@ -19,8 +19,9 @@
 
 extern PHP_MINIT_FUNCTION(http_url);
 
 
 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_REPLACE               0x000
 #define HTTP_URL_JOIN_PATH             0x001


@@ -39,6 +40,7 @@ PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC);
        HTTP_URL_STRIP_QUERY | \
        HTTP_URL_STRIP_FRAGMENT \
 )
        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);
 
 #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);