performance improvements

[m6w6/ext-http] / src / php_http_info.c

diff --git a/src/php_http_info.c b/src/php_http_info.c
index 1470f976e2b554f4cd193732a25ee6a6cea2ac3c..5125a94f2318917369f1d7699dba5ac0f59618e4 100644 (file)
--- a/src/php_http_info.c
+++ b/src/php_http_info.c
@@ -96,12 +96,12 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
        zend_bool free_info = !info;
 
        /* sane parameter */
        zend_bool free_info = !info;
 
        /* sane parameter */

-       if ((!pre_header) || (!*pre_header)) {
+       if (UNEXPECTED((!pre_header) || (!*pre_header))) {

                return NULL;
        }
 
        /* where's the end of the line */
                return NULL;
        }
 
        /* where's the end of the line */

-       if (!(end = php_http_locate_eol(pre_header, NULL))) {
+       if (UNEXPECTED(!(end = php_http_locate_eol(pre_header, NULL)))) {

                end = pre_header + strlen(pre_header);
        }
 
                end = pre_header + strlen(pre_header);
        }
 


@@ -112,7 +112,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 
        info = php_http_info_init(info);
 
 
        info = php_http_info_init(info);
 

-       if (!php_http_version_parse(&info->http.version, http)) {
+       if (UNEXPECTED(!php_http_version_parse(&info->http.version, http))) {

                if (free_info) {
                        php_http_info_free(&info);
                }
                if (free_info) {
                        php_http_info_free(&info);
                }


@@ -126,7 +126,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
        }
 
        /* and nothing than SPACE or NUL after HTTP/X(.x) */
        }
 
        /* and nothing than SPACE or NUL after HTTP/X(.x) */

-       if (*off && (!PHP_HTTP_IS_CTYPE(space, *off))) {
+       if (UNEXPECTED(*off && (!PHP_HTTP_IS_CTYPE(space, *off)))) {

                if (free_info) {
                        php_http_info_free(&info);
                }
                if (free_info) {
                        php_http_info_free(&info);
                }


@@ -147,7 +147,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
 
                info->type = PHP_HTTP_RESPONSE;
                while (code < end && ' ' == *code) ++code;
 
                info->type = PHP_HTTP_RESPONSE;
                while (code < end && ' ' == *code) ++code;

-               if (end > code) {
+               if (EXPECTED(end > code)) {

                        /* 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');
                        /* 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');


@@ -162,7 +162,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                } else {
                        PHP_HTTP_INFO(info).response.code = 0;
                }
                } else {
                        PHP_HTTP_INFO(info).response.code = 0;
                }

-               if (status && end > status) {
+               if (EXPECTED(status && end > status)) {

                        while (' ' == *status) ++status;
                        PHP_HTTP_INFO(info).response.status = estrndup(status, end - status);
                } else {
                        while (' ' == *status) ++status;
                        PHP_HTTP_INFO(info).response.status = estrndup(status, end - status);
                } else {


@@ -177,7 +177,7 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                const char *url = strchr(pre_header, ' ');
 
                info->type = PHP_HTTP_REQUEST;
                const char *url = strchr(pre_header, ' ');
 
                info->type = PHP_HTTP_REQUEST;

-               if (url && http > url) {
+               if (EXPECTED(url && http > url)) {

                        size_t url_len = url - pre_header;
 
                        PHP_HTTP_INFO(info).request.method = estrndup(pre_header, url_len);
                        size_t url_len = url - pre_header;
 
                        PHP_HTTP_INFO(info).request.method = estrndup(pre_header, url_len);


@@ -185,9 +185,9 @@ php_http_info_t *php_http_info_parse(php_http_info_t *info, const char *pre_head
                        while (' ' == *url) ++url;
                        while (' ' == *(http-1)) --http;
 
                        while (' ' == *url) ++url;
                        while (' ' == *(http-1)) --http;
 

-                       if (http > url) {
+                       if (EXPECTED(http > url)) {

                                /* CONNECT presents an authority only */
                                /* CONNECT presents an authority only */

-                               if (strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT")) {
+                               if (UNEXPECTED(strcasecmp(PHP_HTTP_INFO(info).request.method, "CONNECT"))) {

                                        PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, PHP_HTTP_URL_STDFLAGS);
                                } else {
                                        PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, PHP_HTTP_URL_STDFLAGS);
                                        PHP_HTTP_INFO(info).request.url = php_http_url_parse(url, http - url, PHP_HTTP_URL_STDFLAGS);
                                } else {
                                        PHP_HTTP_INFO(info).request.url = php_http_url_parse_authority(url, http - url, PHP_HTTP_URL_STDFLAGS);