X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_url.c;h=71f97a3fd227960059c6779aa6a8bce0a2f551fc;hp=a3750183985fa1bd135a7b544f6c27647fcca098;hb=791511f3bc18cdc68b3f27b43d9396cf56d99e5a;hpb=a4114b0ea5757190fdd7218dbf23588b6ae6e9a8 diff --git a/php_http_url.c b/php_http_url.c index a375018..71f97a3 100644 --- a/php_http_url.c +++ b/php_http_url.c @@ -203,20 +203,15 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u } else { const char *path = NULL; - url(buf)->path = &buf.data[buf.used]; - if (url_isset(new_url, path)) { path = new_url->path; } else if (url_isset(old_url, path)) { path = old_url->path; - } else { - php_http_buffer_append(&buf, "/", sizeof("/")); } if (path) { - if (path[0] != '/') { - php_http_buffer_append(&buf, "/", 1); - } + url(buf)->path = &buf.data[buf.used]; + php_http_buffer_append(&buf, path, strlen(path) + 1); } @@ -261,22 +256,6 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u php_http_url_free(&tmp_url); } - /* set some sane defaults */ - - if (!url(buf)->scheme) { - url(buf)->scheme = &buf.data[buf.used]; - php_http_buffer_append(&buf, "http", sizeof("http")); - } - - if (!url(buf)->host) { - url(buf)->host = &buf.data[buf.used]; - php_http_buffer_append(&buf, "localhost", sizeof("localhost")); - } - - if (!url(buf)->path) { - url(buf)->path = &buf.data[buf.used]; - php_http_buffer_append(&buf, "/", sizeof("/")); - } /* replace directory references if path is not a single slash */ if ((flags & PHP_HTTP_URL_SANITIZE_PATH) && url(buf)->path[0] && url(buf)->path[1]) { @@ -329,8 +308,8 @@ php_http_url_t *php_http_url_mod(const php_http_url_t *old_url, const php_http_u } /* unset default ports */ if (url(buf)->port) { - if ( ((url(buf)->port == 80) && !strcmp(url(buf)->scheme, "http")) - || ((url(buf)->port ==443) && !strcmp(url(buf)->scheme, "https")) + if ( ((url(buf)->port == 80) && url(buf)->scheme && !strcmp(url(buf)->scheme, "http")) + || ((url(buf)->port ==443) && url(buf)->scheme && !strcmp(url(buf)->scheme, "https")) ) { url(buf)->port = 0; } @@ -364,14 +343,18 @@ char *php_http_url_to_string(const php_http_url_t *url, char **url_str, size_t * if (url->host && *url->host) { php_http_buffer_appendl(&buf, url->host); - } - - if (url->port) { - php_http_buffer_appendf(&buf, ":%hu", url->port); + if (url->port) { + php_http_buffer_appendf(&buf, ":%hu", url->port); + } } if (url->path && *url->path) { + if (*url->path != '/') { + php_http_buffer_appends(&buf, "/"); + } php_http_buffer_appendl(&buf, url->path); + } else if (buf.used) { + php_http_buffer_appends(&buf, "/"); } if (url->query && *url->query) { @@ -398,6 +381,42 @@ char *php_http_url_to_string(const php_http_url_t *url, char **url_str, size_t * return buf.data; } +char *php_http_url_authority_to_string(const php_http_url_t *url, char **url_str, size_t *url_len) +{ + php_http_buffer_t buf; + + php_http_buffer_init(&buf); + + if (url->user && *url->user) { + php_http_buffer_appendl(&buf, url->user); + if (url->pass && *url->pass) { + php_http_buffer_appends(&buf, ":"); + php_http_buffer_appendl(&buf, url->pass); + } + php_http_buffer_appends(&buf, "@"); + } + + if (url->host && *url->host) { + php_http_buffer_appendl(&buf, url->host); + if (url->port) { + php_http_buffer_appendf(&buf, ":%hu", url->port); + } + } + + php_http_buffer_shrink(&buf); + php_http_buffer_fix(&buf); + + if (url_len) { + *url_len = buf.used; + } + + if (url_str) { + *url_str = buf.data; + } + + return buf.data; +} + php_http_url_t *php_http_url_from_zval(zval *value, unsigned flags TSRMLS_DC) { zval *zcpy; @@ -890,7 +909,9 @@ static STATUS parse_hostinfo(struct parse_state *state, const char *ptr) break; default: - if (port) { + if (ptr == end) { + break; + } else if (port) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse port; unexpected byte 0x%02x at pos %u in '%s'", (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp); @@ -961,6 +982,7 @@ static const char *parse_authority(struct parse_state *state) case '?': case '#': case '\0': + EOD: /* host delimiter */ if (tmp != state->ptr && SUCCESS != parse_hostinfo(state, tmp)) { return NULL; @@ -969,7 +991,8 @@ static const char *parse_authority(struct parse_state *state) } } while (++state->ptr <= state->end); - return NULL; + --state->ptr; + goto EOD; } static const char *parse_path(struct parse_state *state) @@ -1270,6 +1293,33 @@ php_http_url_t *php_http_url_parse(const char *str, size_t len, unsigned flags T return (php_http_url_t *) state; } +php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsigned flags TSRMLS_DC) +{ + size_t maxlen = 3 * len; + struct parse_state *state = ecalloc(1, sizeof(*state) + maxlen); + + state->end = str + len; + state->ptr = str; + state->flags = flags; + state->maxlen = maxlen; + TSRMLS_SET_CTX(state->ts); + + if (!(state->ptr = parse_authority(state))) { + efree(state); + return NULL; + } + + if (state->ptr != state->end) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, + "Failed to parse URL authority, unexpected character at pos %u in '%s'", + (unsigned) (state->ptr - str), str); + efree(state); + return NULL; + } + + return (php_http_url_t *) state; +} + ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl___construct, 0, 0, 0) ZEND_ARG_INFO(0, old_url) ZEND_ARG_INFO(0, new_url) @@ -1396,67 +1446,12 @@ PHP_METHOD(HttpUrl, toArray) php_http_url_free(&purl); } -ZEND_BEGIN_ARG_INFO_EX(ai_HttpUrl_parse, 0, 0, 1) - ZEND_ARG_INFO(0, url) - ZEND_ARG_INFO(0, flags) -ZEND_END_ARG_INFO(); -PHP_METHOD(HttpUrl, parse) -{ - char *str; - int len; - long flags = 0; - php_http_url_t *url; - zend_error_handling zeh; - - php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &str, &len, &flags), invalid_arg, return); - - zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC); - if ((url = php_http_url_parse(str, len, flags TSRMLS_CC))) { - object_init_ex(return_value, php_http_url_class_entry); - if (url->scheme) { - zend_update_property_string(php_http_url_class_entry, return_value, - ZEND_STRL("scheme"), url->scheme TSRMLS_CC); - } - if (url->user) { - zend_update_property_string(php_http_url_class_entry, return_value, - ZEND_STRL("user"), url->user TSRMLS_CC); - } - if (url->pass) { - zend_update_property_string(php_http_url_class_entry, return_value, - ZEND_STRL("pass"), url->pass TSRMLS_CC); - } - if (url->host) { - zend_update_property_string(php_http_url_class_entry, return_value, - ZEND_STRL("host"), url->host TSRMLS_CC); - } - if (url->port) { - zend_update_property_long(php_http_url_class_entry, return_value, - ZEND_STRL("port"), url->port TSRMLS_CC); - } - if (url->path) { - zend_update_property_string(php_http_url_class_entry, return_value, - ZEND_STRL("path"), url->path TSRMLS_CC); - } - if (url->query) { - zend_update_property_string(php_http_url_class_entry, return_value, - ZEND_STRL("query"), url->query TSRMLS_CC); - } - if (url->fragment) { - zend_update_property_string(php_http_url_class_entry, return_value, - ZEND_STRL("fragment"), url->fragment TSRMLS_CC); - } - php_http_url_free(&url); - } - zend_restore_error_handling(&zeh TSRMLS_CC); -} - static zend_function_entry php_http_url_methods[] = { PHP_ME(HttpUrl, __construct, ai_HttpUrl___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) PHP_ME(HttpUrl, mod, ai_HttpUrl_mod, ZEND_ACC_PUBLIC) PHP_ME(HttpUrl, toString, ai_HttpUrl_toString, ZEND_ACC_PUBLIC) ZEND_MALIAS(HttpUrl, __toString, toString, ai_HttpUrl_toString, ZEND_ACC_PUBLIC) PHP_ME(HttpUrl, toArray, ai_HttpUrl_toArray, ZEND_ACC_PUBLIC) - PHP_ME(HttpUrl, parse, ai_HttpUrl_parse, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) EMPTY_FUNCTION_ENTRY };