- add HTTP_URL_STRIP_ALL constant

- recognize HTTPS server variable
- simplify building urls where path is based on SG(request_).request_uri

diff --git a/http_url_api.c b/http_url_api.c
index 1ccd4dba72a529f92929d8016bc735a63d3d0051..827c7b6a2c5d6c1db62c459deb9af71ed7aaa011 100644 (file)
--- a/http_url_api.c
+++ b/http_url_api.c
@@ -62,6 +62,7 @@ PHP_MINIT_FUNCTION(http_url)
        HTTP_LONG_CONSTANT("HTTP_URL_STRIP_PATH", HTTP_URL_STRIP_PATH);
        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);
        return SUCCESS;
 }
 
@@ -156,6 +157,10 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
        }
        
        if (!url->scheme) {
+               zval *https = http_get_server_var("HTTPS");
+               if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) {
+                       url->scheme = estrndup("https", lenof("https"));
+               } else
                switch (url->port)
                {
                        case 443:
@@ -193,7 +198,7 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
        }
        
        if (!url->path) {
-               if (SG(request_info).request_uri && *SG(request_info).request_uri) {
+               if (SG(request_info).request_uri && SG(request_info).request_uri[0]) {
                        const char *q = strchr(SG(request_info).request_uri, '?');
                        
                        if (q) {
@@ -204,30 +209,23 @@ PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
                } else {
                        url->path = estrndup("/", 1);
                }
-       } else if (*url->path != '/') {
-               if (SG(request_info).request_uri && *SG(request_info).request_uri) {
-                       const char *q = strchr(SG(request_info).request_uri, '?');
-                       char *uri, *path;
-                       size_t len;
-                       
-                       if (q) {
-                               uri = estrndup(SG(request_info).request_uri, len = q - SG(request_info).request_uri);
-                       } else {
-                               uri = estrndup(SG(request_info).request_uri, len = strlen(SG(request_info).request_uri));
-                       }
-                       
-                       php_dirname(uri, len);
-                       spprintf(&path, 0, "%s/%s", uri, url->path);
-                       efree(uri);
-                       STR_SET(url->path, path);
-               } else {
-                       char *uri;
-                       
-                       spprintf(&uri, 0, "/%s", url->path);
-                       STR_SET(url->path, uri);
+       } else if (url->path[0] != '/' && 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;
+               
+               if (SG(request_info).request_uri[ulen-1] != '/') {
+                       for (--ulen; ulen && SG(request_info).request_uri[ulen - 1] != '/'; --ulen);
                }
+               
+               path = emalloc(ulen + plen + 1);
+               memcpy(path, SG(request_info).request_uri, ulen);
+               memcpy(path + ulen, url->path, plen);
+               path[ulen + plen] = '\0';
+               STR_SET(url->path, path);
        }
-       if (url->path) {
+       /* replace directory references if path is not a single slash */
+       if (url->path[0] && (url->path[0] != '/' || url->path[1])) {
                char *ptr, *end = url->path + strlen(url->path) + 1;
                        
                for (ptr = strstr(url->path, "/."); ptr; ptr = strstr(ptr, "/.")) {

diff --git a/php_http_url_api.h b/php_http_url_api.h
index cc7951dbbf31c5135af79066a617a100bc8b1863..fbb4ae1c991b020c74bda4a67975a1c532d88e44 100644 (file)
--- a/php_http_url_api.h
+++ b/php_http_url_api.h
@@ -32,6 +32,13 @@ PHP_HTTP_API char *_http_absolute_url(const char *url TSRMLS_DC);
 #define HTTP_URL_STRIP_PATH            0x040
 #define HTTP_URL_STRIP_QUERY   0x080
 #define HTTP_URL_STRIP_FRAGMENT        0x100
+#define HTTP_URL_STRIP_ALL ( \
+       HTTP_URL_STRIP_AUTH | \
+       HTTP_URL_STRIP_PORT | \
+       HTTP_URL_STRIP_PATH | \
+       HTTP_URL_STRIP_QUERY | \
+       HTTP_URL_STRIP_FRAGMENT \
+)
 
 #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);