projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- curl grabs longs, so pass longs to curl_easy_setopt()
[m6w6/ext-http]
/
http_url_api.c
diff --git
a/http_url_api.c
b/http_url_api.c
index 1ccd4dba72a529f92929d8016bc735a63d3d0051..60fc11ffb19e086b114a64e10f3a471a2f1cdb0e 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_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;
}
return SUCCESS;
}
@@
-104,10
+105,10
@@
PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
if (!(flags & HTTP_URL_STRIP_PORT)) {
url->port = (new_url&&new_url->port) ? new_url->port : ((old_url) ? old_url->port : 0);
}
if (!(flags & HTTP_URL_STRIP_PORT)) {
url->port = (new_url&&new_url->port) ? new_url->port : ((old_url) ? old_url->port : 0);
}
- if (
(!(flags & HTTP_URL_STRIP_AUTH)) && (!(flags & HTTP_URL_STRIP_USER)
)) {
+ if (
!(flags & HTTP_URL_STRIP_USER
)) {
__URLCPY(user);
}
__URLCPY(user);
}
- if (
(!(flags & HTTP_URL_STRIP_AUTH)) && (!(flags & HTTP_URL_STRIP_PASS)
)) {
+ if (
!(flags & HTTP_URL_STRIP_PASS
)) {
__URLCPY(pass);
}
__URLCPY(pass);
}
@@
-156,18
+157,20
@@
PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
}
if (!url->scheme) {
}
if (!url->scheme) {
- switch (url->port)
- {
+ 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:
url->scheme = estrndup("https", lenof("https"));
case 443:
url->scheme = estrndup("https", lenof("https"));
- break;
+
break;
#ifndef HTTP_HAVE_NETDB
default:
#endif
case 80:
url->scheme = estrndup("http", lenof("http"));
#ifndef HTTP_HAVE_NETDB
default:
#endif
case 80:
url->scheme = estrndup("http", lenof("http"));
- break;
+
break;
#ifdef HTTP_HAVE_NETDB
default:
#ifdef HTTP_HAVE_NETDB
default:
@@
-176,7
+179,7
@@
PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
} else {
url->scheme = estrndup("http", lenof("http"));
}
} else {
url->scheme = estrndup("http", lenof("http"));
}
- break;
+
break;
#endif
}
}
#endif
}
}
@@
-193,7
+196,7
@@
PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
}
if (!url->path) {
}
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) {
const char *q = strchr(SG(request_info).request_uri, '?');
if (q) {
@@
-204,42
+207,43
@@
PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
} else {
url->path = estrndup("/", 1);
}
} 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
;
+ } else if (
url->path[0]
!= '/') {
+ if (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 (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));
+ if (SG(request_info).request_uri[ulen-1] != '/') {
+ for (--ulen; ulen && SG(request_info).request_uri[ulen - 1] != '/'; --ulen);
}
}
- php_dirname(uri, len);
- spprintf(&path, 0, "%s/%s", uri, url->path);
- efree(uri);
+ 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);
} else {
STR_SET(url->path, path);
} else {
- char *uri;
+ size_t plen = strlen(url->path);
+ char *path = emalloc(plen + 1 + 1);
- spprintf(&uri, 0, "/%s", url->path);
- STR_SET(url->path, uri);
+ path[0] = '/';
+ memcpy(&path[1], url->path, plen + 1);
+ 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, "/.")) {
char *ptr, *end = url->path + strlen(url->path) + 1;
for (ptr = strstr(url->path, "/."); ptr; ptr = strstr(ptr, "/.")) {
- switch (ptr[2])
- {
+ switch (ptr[2]) {
case '\0':
ptr[1] = '\0';
case '\0':
ptr[1] = '\0';
- break;
+
break;
case '/':
memmove(&ptr[1], &ptr[3], end - &ptr[3]);
case '/':
memmove(&ptr[1], &ptr[3], end - &ptr[3]);
- break;
+
break;
case '.':
if (ptr[3] == '/') {
case '.':
if (ptr[3] == '/') {
@@
-251,12
+255,12
@@
PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
}
memmove(&ptr[1], pos, end - pos);
}
}
memmove(&ptr[1], pos, end - pos);
}
- break;
+
break;
default:
/* something else */
++ptr;
default:
/* something else */
++ptr;
- break;
+
break;
}
}
}
}
}
}
@@
-301,9
+305,6
@@
PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_u
strlcat(*url_str, port_str, HTTP_URL_MAXLEN);
}
strlcat(*url_str, port_str, HTTP_URL_MAXLEN);
}
- if (*url->path != '/') {
- strlcat(*url_str, "/", HTTP_URL_MAXLEN);
- }
strlcat(*url_str, url->path, HTTP_URL_MAXLEN);
if (url->query && *url->query) {
strlcat(*url_str, url->path, HTTP_URL_MAXLEN);
if (url->query && *url->query) {