error control for http\Url

diff --git a/src/php_http_client_request.c b/src/php_http_client_request.c
index 0e40cc5bc930778620321479e570da865b4686ac..01e02b95f76e3193254a801075d9a313f002a92b 100644 (file)
--- a/src/php_http_client_request.c
+++ b/src/php_http_client_request.c
@@ -53,7 +53,7 @@ static PHP_METHOD(HttpClientRequest, __construct)
                PHP_HTTP_INFO(obj->message).request.method = estrndup(meth_str, meth_len);
        }
        if (zurl) {
                PHP_HTTP_INFO(obj->message).request.method = estrndup(meth_str, meth_len);
        }
        if (zurl) {

-               PHP_HTTP_INFO(obj->message).request.url = php_http_url_from_zval(zurl, ~0 TSRMLS_CC);
+               PHP_HTTP_INFO(obj->message).request.url = php_http_url_from_zval(zurl, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);

        }
        if (zheaders) {
                array_copy(Z_ARRVAL_P(zheaders), &obj->message->hdrs);
        }
        if (zheaders) {
                array_copy(Z_ARRVAL_P(zheaders), &obj->message->hdrs);

diff --git a/src/php_http_info.c b/src/php_http_info.c
index 800821521154cb0e4966275a0a5e76da98ed56ae..13bf1246a5d7b615d4c7acb4f7ca2876f0577feb 100644 (file)
--- a/src/php_http_info.c
+++ b/src/php_http_info.c
@@ -147,9 +147,9 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                        if (http > url) {
                                /* CONNECT presents an authority only */
                                if (strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT")) {
                        if (http > url) {
                                /* CONNECT presents an authority only */
                                if (strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT")) {

-                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, ~0 TSRMLS_CC);
+                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);

                                } else {
                                } else {

-                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, ~0 TSRMLS_CC);
+                                       PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);

                                }
                                if (!PHP_HTTP_INFO(info).request.url) {
                                        PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);
                                }
                                if (!PHP_HTTP_INFO(info).request.url) {
                                        PTR_SET(PHP_HTTP_INFO(info).request.method, NULL);

diff --git a/src/php_http_message.c b/src/php_http_message.c
index 2b3090a0509ce4f1ccc861afdedb8d9d9a802678..388c0ad7e5c4a750a38abdaad0ca20691ef9a936 100644 (file)
--- a/src/php_http_message.c
+++ b/src/php_http_message.c
@@ -69,7 +69,7 @@ php_http_message_t *php_http_message_init_env(php_http_message_t *message, php_h
                                message->http.info.request.method = estrdup(Z_STRVAL_P(sval));
                        }
                        if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1 TSRMLS_CC))) {
                                message->http.info.request.method = estrdup(Z_STRVAL_P(sval));
                        }
                        if ((sval = php_http_env_get_server_var(ZEND_STRL("REQUEST_URI"), 1 TSRMLS_CC))) {

-                               message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), ~0 TSRMLS_CC);
+                               message->http.info.request.url = php_http_url_parse(Z_STRVAL_P(sval), Z_STRLEN_P(sval), PHP_HTTP_URL_STDFLAGS TSRMLS_CC);

                        }
 
                        php_http_env_get_request_headers(&message->hdrs TSRMLS_CC);
                        }
 
                        php_http_env_get_request_headers(&message->hdrs TSRMLS_CC);


@@ -605,7 +605,7 @@ static void php_http_message_object_prophandler_get_request_url(php_http_message
 }
 static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
        if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) {
 }
 static void php_http_message_object_prophandler_set_request_url(php_http_message_object_t *obj, zval *value TSRMLS_DC) {
        if (PHP_HTTP_MESSAGE_TYPE(REQUEST, obj->message)) {

-               PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, ~0 TSRMLS_CC));
+               PTR_SET(obj->message->http.info.request.url, php_http_url_from_zval(value, PHP_HTTP_URL_STDFLAGS TSRMLS_CC));

        }
 }
 static void php_http_message_object_prophandler_get_response_status(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) {
        }
 }
 static void php_http_message_object_prophandler_get_response_status(php_http_message_object_t *obj, zval *return_value TSRMLS_DC) {


@@ -1647,7 +1647,7 @@ static PHP_METHOD(HttpMessage, setRequestUrl)
        }
 
        zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
        }
 
        zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);

-       url = php_http_url_from_zval(zurl, ~0 TSRMLS_CC);
+       url = php_http_url_from_zval(zurl, PHP_HTTP_URL_STDFLAGS TSRMLS_CC);

        zend_restore_error_handling(&zeh TSRMLS_CC);
 
        if (url && php_http_url_is_empty(url)) {
        zend_restore_error_handling(&zeh TSRMLS_CC);
 
        if (url && php_http_url_is_empty(url)) {

diff --git a/src/php_http_url.c b/src/php_http_url.c
index 9140c6824e32ad2a7819b20982fd322d4e111187..8384f99a8c7df39e2d3e678de739c3f38308c68b 100644 (file)
--- a/src/php_http_url.c
+++ b/src/php_http_url.c
@@ -775,10 +775,16 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt
                switch (*ptr) {
                case ':':
                        if (password) {
                switch (*ptr) {
                case ':':
                        if (password) {

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse password; duplicate ':' at pos %u in '%s'",
-                                               (unsigned) (ptr - tmp), tmp);
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse password; duplicate ':' at pos %u in '%s'",
+                                                       (unsigned) (ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               state->buffer[state->offset++] = *ptr;
+                               break;

                        }
                        password = ptr + 1;
                        state->buffer[state->offset++] = 0;
                        }
                        password = ptr + 1;
                        state->buffer[state->offset++] = 0;


@@ -787,16 +793,31 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt
 
                case '%':
                        if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {
 
                case '%':
                        if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse userinfo; invalid percent encoding at pos %u in '%s'",
-                                               (unsigned) (ptr - tmp), tmp);
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse userinfo; invalid percent encoding at pos %u in '%s'",
+                                                       (unsigned) (ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               state->buffer[state->offset++] = *ptr++;
+                               break;

                        }
                        state->buffer[state->offset++] = *ptr++;
                        state->buffer[state->offset++] = *ptr++;
                        state->buffer[state->offset++] = *ptr;
                        break;
 
                        }
                        state->buffer[state->offset++] = *ptr++;
                        state->buffer[state->offset++] = *ptr++;
                        state->buffer[state->offset++] = *ptr;
                        break;
 

+               default:
+                       if ((mb = parse_mb(state, PARSE_USERINFO, ptr, end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) {
+                               ptr += mb - 1;
+                               break;
+                       }
+                       if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                               return FAILURE;
+                       }
+                       /* no break */

                case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
                case '+': case ',': case ';': case '=': /* sub-delims */
                case '-': case '.': case '_': case '~': /* unreserved */
                case '!': case '$': case '&': case '\'': case '(': case ')': case '*':
                case '+': case ',': case ';': case '=': /* sub-delims */
                case '-': case '.': case '_': case '~': /* unreserved */


@@ -814,11 +835,6 @@ static ZEND_RESULT_CODE parse_userinfo(struct parse_state *state, const char *pt
                        state->buffer[state->offset++] = *ptr;
                        break;
 
                        state->buffer[state->offset++] = *ptr;
                        break;
 

-               default:
-                       if (!(mb = parse_mb(state, PARSE_USERINFO, ptr, end, tmp, 0))) {
-                               return FAILURE;
-                       }
-                       ptr += mb - 1;

                }
        } while(++ptr != end);
 
                }
        } while(++ptr != end);
 


@@ -889,15 +905,19 @@ static ZEND_RESULT_CODE parse_idn2(struct parse_state *state, size_t prev_len)
        }
 #      endif
        if (rv != IDN2_OK) {
        }
 #      endif
        if (rv != IDN2_OK) {

-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idn2_strerror(rv));
-               return FAILURE;
+               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idn2_strerror(rv));
+               }
+               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                       return FAILURE;
+               }

        } else {
                size_t idnlen = strlen(idn);
                memcpy(state->url.host, idn, idnlen + 1);
                free(idn);
                state->offset += idnlen - prev_len;
        } else {
                size_t idnlen = strlen(idn);
                memcpy(state->url.host, idn, idnlen + 1);
                free(idn);
                state->offset += idnlen - prev_len;

-               return SUCCESS;

        }
        }

+       return SUCCESS;

 }
 #elif PHP_HTTP_HAVE_IDN
 static ZEND_RESULT_CODE parse_idn(struct parse_state *state, size_t prev_len)
 }
 #elif PHP_HTTP_HAVE_IDN
 static ZEND_RESULT_CODE parse_idn(struct parse_state *state, size_t prev_len)


@@ -915,15 +935,19 @@ static ZEND_RESULT_CODE parse_idn(struct parse_state *state, size_t prev_len)
        }
 #      endif
        if (rv != IDNA_SUCCESS) {
        }
 #      endif
        if (rv != IDNA_SUCCESS) {

-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv));
-               return FAILURE;
+               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse IDN; %s", idna_strerror(rv));
+               }
+               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                       return FAILURE;
+               }

        } else {
                size_t idnlen = strlen(idn);
                memcpy(state->url.host, idn, idnlen + 1);
                free(idn);
                state->offset += idnlen - prev_len;
        } else {
                size_t idnlen = strlen(idn);
                memcpy(state->url.host, idn, idnlen + 1);
                free(idn);
                state->offset += idnlen - prev_len;

-               return SUCCESS;

        }
        }

+       return SUCCESS;

 }
 #endif
 
 }
 #endif
 


@@ -1024,6 +1048,7 @@ static ZEND_RESULT_CODE parse_widn(struct parse_state *state)
 #ifdef HAVE_INET_PTON
 static const char *parse_ip6(struct parse_state *state, const char *ptr)
 {
 #ifdef HAVE_INET_PTON
 static const char *parse_ip6(struct parse_state *state, const char *ptr)
 {

+       unsigned pos = 0;

        const char *error = NULL, *end = state->ptr, *tmp = memchr(ptr, ']', end - ptr);
        TSRMLS_FETCH_FROM_CTX(state->ts);
 
        const char *error = NULL, *end = state->ptr, *tmp = memchr(ptr, ']', end - ptr);
        TSRMLS_FETCH_FROM_CTX(state->ts);
 


@@ -1041,17 +1066,21 @@ static const char *parse_ip6(struct parse_state *state, const char *ptr)
                        state->buffer[state->offset++] = 0;
                        ptr = tmp + 1;
                } else if (rv == -1) {
                        state->buffer[state->offset++] = 0;
                        ptr = tmp + 1;
                } else if (rv == -1) {

+                       pos = 1;

                        error = strerror(errno);
                } else {
                        error = "unexpected '['";
                }
                efree(addr);
        } else {
                        error = strerror(errno);
                } else {
                        error = "unexpected '['";
                }
                efree(addr);
        } else {

+               pos = tmp ? tmp - ptr : end - ptr;

                error = "expected ']'";
        }
 
        if (error) {
                error = "expected ']'";
        }
 
        if (error) {

-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse hostinfo; %s", error);
+               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to parse hostinfo; %s at pos %u in '%s'", error, pos, ptr);
+               }

                return NULL;
        }
 
                return NULL;
        }
 


@@ -1061,13 +1090,16 @@ static const char *parse_ip6(struct parse_state *state, const char *ptr)
 
 static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *ptr)
 {
 
 static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *ptr)
 {

-       size_t mb, len;
+       size_t mb, len = state->offset;

        const char *end = state->ptr, *tmp = ptr, *port = NULL, *label = NULL;
        TSRMLS_FETCH_FROM_CTX(state->ts);
 
 #ifdef HAVE_INET_PTON
        if (*ptr == '[' && !(ptr = parse_ip6(state, ptr))) {
        const char *end = state->ptr, *tmp = ptr, *port = NULL, *label = NULL;
        TSRMLS_FETCH_FROM_CTX(state->ts);
 
 #ifdef HAVE_INET_PTON
        if (*ptr == '[' && !(ptr = parse_ip6(state, ptr))) {

-               return FAILURE;
+               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                       return FAILURE;
+               }
+               ptr = tmp;

        }
 #endif
 
        }
 #endif
 


@@ -1075,20 +1107,30 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
                switch (*ptr) {
                case ':':
                        if (port) {
                switch (*ptr) {
                case ':':
                        if (port) {

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse port; unexpected ':' at pos %u in '%s'",
-                                               (unsigned) (ptr - tmp), tmp);
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse port; unexpected ':' at pos %u in '%s'",
+                                                       (unsigned) (ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }

                        }
                        port = ptr + 1;
                        break;
 
                case '%':
                        if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {
                        }
                        port = ptr + 1;
                        break;
 
                case '%':
                        if (ptr[1] != '%' && (end - ptr <= 2 || !isxdigit(*(ptr+1)) || !isxdigit(*(ptr+2)))) {

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse hostinfo; invalid percent encoding at pos %u in '%s'",
-                                               (unsigned) (ptr - tmp), tmp);
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse hostinfo; invalid percent encoding at pos %u in '%s'",
+                                                       (unsigned) (ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               state->buffer[state->offset++] = *ptr++;
+                               break;

                        }
                        state->buffer[state->offset++] = *ptr++;
                        state->buffer[state->offset++] = *ptr++;
                        }
                        state->buffer[state->offset++] = *ptr++;
                        state->buffer[state->offset++] = *ptr++;


@@ -1100,11 +1142,16 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
                                /* sort of a compromise, just ensure we don't end up
                                 * with a dot at the beginning or two consecutive dots
                                 */
                                /* sort of a compromise, just ensure we don't end up
                                 * with a dot at the beginning or two consecutive dots
                                 */

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse %s; unexpected '%c' at pos %u in '%s'",
-                                               port ? "port" : "host",
-                                               (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse %s; unexpected '%c' at pos %u in '%s'",
+                                                       port ? "port" : "host",
+                                                       (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               break;

                        }
                        state->buffer[state->offset++] = *ptr;
                        label = NULL;
                        }
                        state->buffer[state->offset++] = *ptr;
                        label = NULL;


@@ -1115,11 +1162,16 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
                                /* sort of a compromise, just ensure we don't end up
                                 * with a hyphen at the beginning
                                 */
                                /* sort of a compromise, just ensure we don't end up
                                 * with a hyphen at the beginning
                                 */

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse %s; unexpected '%c' at pos %u in '%s'",
-                                               port ? "port" : "host",
-                                               (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse %s; unexpected '%c' at pos %u in '%s'",
+                                                       port ? "port" : "host",
+                                                       (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               break;

                        }
                        /* no break */
                case '_': case '~': /* unreserved */
                        }
                        /* no break */
                case '_': case '~': /* unreserved */


@@ -1134,10 +1186,15 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
                case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
                case 'v': case 'w': case 'x': case 'y': case 'z':
                        if (port) {
                case 'o': case 'p': case 'q': case 'r': case 's': case 't': case 'u':
                case 'v': case 'w': case 'x': case 'y': case 'z':
                        if (port) {

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse port; unexpected char '%c' at pos %u in '%s'",
-                                               (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse port; unexpected char '%c' at pos %u in '%s'",
+                                                       (unsigned char) *ptr, (unsigned) (ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               break;

                        }
                        /* no break */
                case '0': case '1': case '2': case '3': case '4': case '5': case '6':
                        }
                        /* no break */
                case '0': case '1': case '2': case '3': case '4': case '5': case '6':


@@ -1156,12 +1213,20 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
                        if (ptr == end) {
                                break;
                        } else 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);
-                               return FAILURE;
-                       } else if (!(mb = parse_mb(state, PARSE_HOSTINFO, ptr, end, tmp, 0))) {
-                               return FAILURE;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       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);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               break;
+                       } else if (!(mb = parse_mb(state, PARSE_HOSTINFO, ptr, end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) {
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return FAILURE;
+                               }
+                               break;

                        }
                        label = ptr;
                        ptr += mb - 1;
                        }
                        label = ptr;
                        ptr += mb - 1;


@@ -1169,7 +1234,7 @@ static ZEND_RESULT_CODE parse_hostinfo(struct parse_state *state, const char *pt
        } while (++ptr != end);
 
        if (!state->url.host) {
        } while (++ptr != end);
 
        if (!state->url.host) {

-               len = (port ? port - tmp - 1 : end - tmp);
+               len = state->offset - len;

                state->url.host = &state->buffer[state->offset - len];
                state->buffer[state->offset++] = 0;
        }
                state->url.host = &state->buffer[state->offset - len];
                state->buffer[state->offset++] = 0;
        }


@@ -1200,10 +1265,15 @@ static const char *parse_authority(struct parse_state *state)
                case '@':
                        /* userinfo delimiter */
                        if (host) {
                case '@':
                        /* userinfo delimiter */
                        if (host) {

-                               TSRMLS_FETCH_FROM_CTX(state->ts);
-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse userinfo; unexpected '@'");
-                               return NULL;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       TSRMLS_FETCH_FROM_CTX(state->ts);
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse userinfo; unexpected '@'");
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return NULL;
+                               }
+                               break;

                        }
                        host = state->ptr + 1;
                        if (tmp != state->ptr && SUCCESS != parse_userinfo(state, tmp)) {
                        }
                        host = state->ptr + 1;
                        if (tmp != state->ptr && SUCCESS != parse_userinfo(state, tmp)) {


@@ -1250,10 +1320,16 @@ static const char *parse_path(struct parse_state *state)
 
                case '%':
                        if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
 
                case '%':
                        if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse path; invalid percent encoding at pos %u in '%s'",
-                                               (unsigned) (state->ptr - tmp), tmp);
-                               return NULL;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse path; invalid percent encoding at pos %u in '%s'",
+                                                       (unsigned) (state->ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return NULL;
+                               }
+                               state->buffer[state->offset++] = *state->ptr;
+                               break;

                        }
                        state->buffer[state->offset++] = *state->ptr++;
                        state->buffer[state->offset++] = *state->ptr++;
                        }
                        state->buffer[state->offset++] = *state->ptr++;
                        state->buffer[state->offset++] = *state->ptr++;


@@ -1280,8 +1356,11 @@ static const char *parse_path(struct parse_state *state)
                        break;
 
                default:
                        break;
 
                default:

-                       if (!(mb = parse_mb(state, PARSE_PATH, state->ptr, state->end, tmp, 0))) {
-                               return NULL;
+                       if (!(mb = parse_mb(state, PARSE_PATH, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) {
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return NULL;
+                               }
+                               break;

                        }
                        state->ptr += mb - 1;
                }
                        }
                        state->ptr += mb - 1;
                }


@@ -1319,21 +1398,27 @@ static const char *parse_query(struct parse_state *state)
 
                case '%':
                        if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
 
                case '%':
                        if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {

-                               php_error_docref(NULL TSRMLS_CC, E_WARNING,
-                                               "Failed to parse query; invalid percent encoding at pos %u in '%s'",
-                                               (unsigned) (state->ptr - tmp), tmp);
-                               return NULL;
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse query; invalid percent encoding at pos %u in '%s'",
+                                                       (unsigned) (state->ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return NULL;
+                               }
+                               /* fallthrough, pct-encode the percent sign */
+                       } else {
+                               state->buffer[state->offset++] = *state->ptr++;
+                               state->buffer[state->offset++] = *state->ptr++;
+                               state->buffer[state->offset++] = *state->ptr;
+                               break;

                        }
                        }

-                       state->buffer[state->offset++] = *state->ptr++;
-                       state->buffer[state->offset++] = *state->ptr++;
-                       state->buffer[state->offset++] = *state->ptr;
-                       break;
-
-               /* RFC1738 unsafe */
+                       /* no break */

                case '{': case '}':
                case '<': case '>':
                case '[': case ']':
                case '|': case '\\': case '^': case '`': case '"': case ' ':
                case '{': case '}':
                case '<': case '>':
                case '[': case ']':
                case '|': case '\\': case '^': case '`': case '"': case ' ':

+                       /* RFC1738 unsafe */

                        if (state->flags & PHP_HTTP_URL_PARSE_TOPCT) {
                                state->buffer[state->offset++] = '%';
                                state->buffer[state->offset++] = parse_xdigits[((unsigned char) *state->ptr) >> 4];
                        if (state->flags & PHP_HTTP_URL_PARSE_TOPCT) {
                                state->buffer[state->offset++] = '%';
                                state->buffer[state->offset++] = parse_xdigits[((unsigned char) *state->ptr) >> 4];


@@ -1362,8 +1447,11 @@ static const char *parse_query(struct parse_state *state)
                        break;
 
                default:
                        break;
 
                default:

-                       if (!(mb = parse_mb(state, PARSE_QUERY, state->ptr, state->end, tmp, 0))) {
-                               return NULL;
+                       if (!(mb = parse_mb(state, PARSE_QUERY, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) {
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return NULL;
+                               }
+                               break;

                        }
                        state->ptr += mb - 1;
                }
                        }
                        state->ptr += mb - 1;
                }


@@ -1393,23 +1481,42 @@ static const char *parse_fragment(struct parse_state *state)
 
        do {
                switch (*state->ptr) {
 
        do {
                switch (*state->ptr) {

-               case '%':
-                       if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
+               case '#':
+                       if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {

                                php_error_docref(NULL TSRMLS_CC, E_WARNING,
                                php_error_docref(NULL TSRMLS_CC, E_WARNING,

-                                               "Failed to parse fragment; invalid percent encoding at pos %u in '%s'",
+                                               "Failed to parse fragment; invalid fragment identifier at pos %u in '%s'",

                                                (unsigned) (state->ptr - tmp), tmp);
                                                (unsigned) (state->ptr - tmp), tmp);

+                       }
+                       if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {

                                return NULL;
                        }
                                return NULL;
                        }

-                       state->buffer[state->offset++] = *state->ptr++;
-                       state->buffer[state->offset++] = *state->ptr++;

                        state->buffer[state->offset++] = *state->ptr;
                        break;
 
                        state->buffer[state->offset++] = *state->ptr;
                        break;
 

-               /* RFC1738 unsafe */
+               case '%':
+                       if (state->ptr[1] != '%' && (state->end - state->ptr <= 2 || !isxdigit(*(state->ptr+1)) || !isxdigit(*(state->ptr+2)))) {
+                               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                                       php_error_docref(NULL TSRMLS_CC, E_WARNING,
+                                                       "Failed to parse fragment; invalid percent encoding at pos %u in '%s'",
+                                                       (unsigned) (state->ptr - tmp), tmp);
+                               }
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return NULL;
+                               }
+                               /* fallthrough */
+                       } else {
+                               state->buffer[state->offset++] = *state->ptr++;
+                               state->buffer[state->offset++] = *state->ptr++;
+                               state->buffer[state->offset++] = *state->ptr;
+                               break;
+                       }
+                       /* no break */
+

                case '{': case '}':
                case '<': case '>':
                case '[': case ']':
                case '|': case '\\': case '^': case '`': case '"': case ' ':
                case '{': case '}':
                case '<': case '>':
                case '[': case ']':
                case '|': case '\\': case '^': case '`': case '"': case ' ':

+                       /* RFC1738 unsafe */

                        if (state->flags & PHP_HTTP_URL_PARSE_TOPCT) {
                                state->buffer[state->offset++] = '%';
                                state->buffer[state->offset++] = parse_xdigits[((unsigned char) *state->ptr) >> 4];
                        if (state->flags & PHP_HTTP_URL_PARSE_TOPCT) {
                                state->buffer[state->offset++] = '%';
                                state->buffer[state->offset++] = parse_xdigits[((unsigned char) *state->ptr) >> 4];


@@ -1438,8 +1545,11 @@ static const char *parse_fragment(struct parse_state *state)
                        break;
 
                default:
                        break;
 
                default:

-                       if (!(mb = parse_mb(state, PARSE_FRAGMENT, state->ptr, state->end, tmp, 0))) {
-                               return NULL;
+                       if (!(mb = parse_mb(state, PARSE_FRAGMENT, state->ptr, state->end, tmp, state->flags & PHP_HTTP_URL_SILENT_ERRORS))) {
+                               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                                       return NULL;
+                               }
+                               break;

                        }
                        state->ptr += mb - 1;
                }
                        }
                        state->ptr += mb - 1;
                }


@@ -1563,11 +1673,15 @@ php_http_url_t *php_http_url_parse_authority(const char *str, size_t len, unsign
        }
 
        if (state->ptr != state->end) {
        }
 
        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;
+               if (!(state->flags & PHP_HTTP_URL_SILENT_ERRORS)) {
+                       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);
+               }
+               if (!(state->flags & PHP_HTTP_URL_IGNORE_ERRORS)) {
+                       efree(state);
+                       return NULL;
+               }

        }
 
        return (php_http_url_t *) state;
        }
 
        return (php_http_url_t *) state;


@@ -1586,7 +1700,13 @@ PHP_METHOD(HttpUrl, __construct)
 
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return);
 
 
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!z!l", &old_url, &new_url, &flags), invalid_arg, return);
 

-       zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+       if (flags & PHP_HTTP_URL_SILENT_ERRORS) {
+               zend_replace_error_handling(EH_SUPPRESS, NULL, &zeh TSRMLS_CC);
+       } else if (flags & PHP_HTTP_URL_IGNORE_ERRORS) {
+               zend_replace_error_handling(EH_NORMAL, NULL, &zeh TSRMLS_CC);
+       } else {
+               zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+       }

        {
                php_http_url_t *res_purl, *new_purl = NULL, *old_purl = NULL;
 
        {
                php_http_url_t *res_purl, *new_purl = NULL, *old_purl = NULL;
 


@@ -1634,7 +1754,13 @@ PHP_METHOD(HttpUrl, mod)
 
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags), invalid_arg, return);
 
 
        php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!|l", &new_url, &flags), invalid_arg, return);
 

-       zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+       if (flags & PHP_HTTP_URL_SILENT_ERRORS) {
+               zend_replace_error_handling(EH_SUPPRESS, NULL, &zeh TSRMLS_CC);
+       } else if (flags & PHP_HTTP_URL_IGNORE_ERRORS) {
+               zend_replace_error_handling(EH_NORMAL, NULL, &zeh TSRMLS_CC);
+       } else {
+               zend_replace_error_handling(EH_THROW, php_http_exception_bad_url_class_entry, &zeh TSRMLS_CC);
+       }

        {
                php_http_url_t *new_purl = NULL, *old_purl = NULL;
 
        {
                php_http_url_t *new_purl = NULL, *old_purl = NULL;
 


@@ -1749,6 +1875,11 @@ PHP_MINIT_FUNCTION(http_url)
 #endif
        zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT TSRMLS_CC);
 
 #endif
        zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("PARSE_TOPCT"), PHP_HTTP_URL_PARSE_TOPCT TSRMLS_CC);
 

+       zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("IGNORE_ERRORS"), PHP_HTTP_URL_IGNORE_ERRORS TSRMLS_CC);
+       zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("SILENT_ERRORS"), PHP_HTTP_URL_SILENT_ERRORS TSRMLS_CC);
+
+       zend_declare_class_constant_long(php_http_url_class_entry, ZEND_STRL("STDFLAGS"), PHP_HTTP_URL_STDFLAGS TSRMLS_CC);
+

        return SUCCESS;
 }
 
        return SUCCESS;
 }
 

diff --git a/src/php_http_url.h b/src/php_http_url.h
index 50c5a5cc0ea0f415886df9b0574f362628fb0f76..3838a6b9ee143572efb46c900c6ff0a47db862f6 100644 (file)
--- a/src/php_http_url.h
+++ b/src/php_http_url.h
@@ -45,6 +45,13 @@
 /* percent encode multibyte sequences in userinfo, path, query and fragment */
 #define PHP_HTTP_URL_PARSE_TOPCT       0x200000
 
 /* percent encode multibyte sequences in userinfo, path, query and fragment */
 #define PHP_HTTP_URL_PARSE_TOPCT       0x200000
 

+/* ignore errors */
+#define PHP_HTTP_URL_IGNORE_ERRORS     0x10000000
+/* do not report errors */
+#define PHP_HTTP_URL_SILENT_ERRORS     0x20000000
+
+#define PHP_HTTP_URL_STDFLAGS          0x00332003
+

 typedef struct php_http_url {
        /* compatible to php_url, but do not use php_url_free() */
        char *scheme;
 typedef struct php_http_url {
        /* compatible to php_url, but do not use php_url_free() */
        char *scheme;

diff --git a/tests/urlparser008.phpt b/tests/urlparser008.phpt
index 9646fa0d67aae97b4c56020cdc52d983270878c1..ce7a8cc8facd8da281997f3780d0af542b61d16e 100644 (file)
--- a/tests/urlparser008.phpt
+++ b/tests/urlparser008.phpt
@@ -29,10 +29,10 @@ DONE
 Test
 
 s://[a:80
 Test
 
 s://[a:80

-http\Url::__construct(): Failed to parse hostinfo; expected ']'
+http\Url::__construct(): Failed to parse hostinfo; expected ']' at pos 5 in '[a:80'

 
 s://[0]
 
 s://[0]

-http\Url::__construct(): Failed to parse hostinfo; unexpected '['
+http\Url::__construct(): Failed to parse hostinfo; unexpected '[' at pos 0 in '[0]'

 
 s://[::1]:80
 object(http\Url)#%d (8) {
 
 s://[::1]:80
 object(http\Url)#%d (8) {