Merge branch 'v2.6.x'

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

diff --git a/src/php_http_version.c b/src/php_http_version.c
index c861a6470a2ba084a5502e3066193547e43967c8..7f7d34245384f000376d2ba6f1725dac3131c466 100644 (file)
--- a/src/php_http_version.c
+++ b/src/php_http_version.c
@@ -12,7 +12,7 @@
 
 #include "php_http_api.h"
 
-php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor TSRMLS_DC)
+php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major, unsigned minor)
 {
        if (!v) {
                v = emalloc(sizeof(*v));
@@ -24,7 +24,7 @@ php_http_version_t *php_http_version_init(php_http_version_t *v, unsigned major,
        return v;
 }
 
-php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str TSRMLS_DC)
+php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *str)
 {
        long major, minor;
        char separator = 0;
@@ -46,7 +46,7 @@ php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *st
                        separator = *ptr++;
                        switch (separator) {
                        default:
-                               php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Non-standard version separator '%c' in HTTP protocol version '%s'", separator, ptr - 2);
+                               php_error_docref(NULL, E_NOTICE, "Non-standard version separator '%c' in HTTP protocol version '%s'", separator, ptr - 2);
                                /* no break */
                        case '.':
                        case ',':
@@ -61,17 +61,17 @@ php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *st
                                }
                        }
                        if (minor >= 0 && minor <= 9) {
-                               return php_http_version_init(v, major, minor TSRMLS_CC);
+                               return php_http_version_init(v, major, minor);
                        }
                }
        }
 
        error:
-       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not parse HTTP protocol version '%s'", str);
+       php_error_docref(NULL, E_WARNING, "Could not parse HTTP protocol version '%s'", str);
        return NULL;
 }
 
-void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post TSRMLS_DC)
+void php_http_version_to_string(php_http_version_t *v, char **str, size_t *len, const char *pre, const char *post)
 {
        *len = spprintf(str, 0, "%s%u.%u%s", pre ? pre : "", v->major, v->minor, post ? post : "");
 }