reduce cost of parsing http start line

diff --git a/php_http_info.c b/php_http_info.c
index 876c7203533bd7b7879b99a7957658adcdcd1a91..905091979a70ac08159ac451bb0c561e92181e18 100644 (file)
--- a/php_http_info.c
+++ b/php_http_info.c
@@ -90,13 +90,22 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 
        /* is response */
        if (pre_header == http) {
 
        /* is response */
        if (pre_header == http) {

-               char *status = NULL;
-               const char *code = http + sizeof("HTTP/X.x");
+               const char *status = NULL, *code = http + sizeof("HTTP/X.x");

                
                info->type = PHP_HTTP_RESPONSE;
                while (' ' == *code) ++code;
                if (code && end > code) {
                
                info->type = PHP_HTTP_RESPONSE;
                while (' ' == *code) ++code;
                if (code && end > code) {

-                       PHP_HTTP_INFO(info).response.code = strtol(code, &status, 10);
+                       /* rfc7230#3.1.2 The status-code element is a 3-digit integer code */
+                       PHP_HTTP_INFO(info).response.code = 100*(*code++ - '0');
+                       PHP_HTTP_INFO(info).response.code += 10*(*code++ - '0');
+                       PHP_HTTP_INFO(info).response.code +=     *code++ - '0';
+                       if (PHP_HTTP_INFO(info).response.code < 100 || PHP_HTTP_INFO(info).response.code > 599) {
+                               if (free_info) {
+                                       php_http_info_free(&info);
+                               }
+                               return NULL;
+                       }
+                       status = code;

                } else {
                        PHP_HTTP_INFO(info).response.code = 0;
                }
                } else {
                        PHP_HTTP_INFO(info).response.code = 0;
                }

diff --git a/php_http_version.c b/php_http_version.c
index f4fcfc85367417dee7cb8f711fe39d89f18250b3..7adef9d3c897ce66f5923b981c74bd3b46a992d0 100644 (file)
--- a/php_http_version.c
+++ b/php_http_version.c
@@ -27,7 +27,7 @@ php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major,
 php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str TSRMLS_DC)
 {
        long major, minor;
 php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str TSRMLS_DC)
 {
        long major, minor;

-       char separator = 0, *stop = NULL;
+       char separator = 0;

        register const char *ptr = str;
 
        switch (*ptr) {
        register const char *ptr = str;
 
        switch (*ptr) {


@@ -40,16 +40,16 @@ php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *st
                ++ptr;
                /* no break */
        default:
                ++ptr;
                /* no break */
        default:

-               major = strtol(ptr, &stop, 10);
-               if (stop && stop != ptr && major != LONG_MIN && major != LONG_MAX) {
-                       separator = *stop;
+               /* rfc7230#2.6 The HTTP version number consists of two decimal digits separated by a "." (period or decimal point) */
+               major = *ptr++ - '0';
+               if (major >= 0 && major <= 9) {
+                       separator = *ptr++;

                        if (separator) {
                                if (separator != '.' && separator != ',') {
                        if (separator) {
                                if (separator != '.' && separator != ',') {

-                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Non-standard version separator '%c' in HTTP protocol version '%s'", separator, ptr);
+                                       php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Non-standard version separator '%c' in HTTP protocol version '%s'", separator, ptr - 2);

                                }
                                }

-                               ptr = stop + 1;
-                               minor = strtol(ptr, &stop, 10);
-                               if (minor != LONG_MIN && minor != LONG_MAX) {
+                               minor = *ptr - '0';
+                               if (minor >= 0 && minor <= 9) {

                                        return php_http_version_init(v, major, minor TSRMLS_CC);
                                }
                        }
                                        return php_http_version_init(v, major, minor TSRMLS_CC);
                                }
                        }