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 7f7d34245384f000376d2ba6f1725dac3131c466..043b4b33ef4a4d0e5a11b0feb258355bac358381 100644 (file)
--- a/src/php_http_version.c
+++ b/src/php_http_version.c
@@ -73,7 +73,12 @@ php_http_version_t *php_http_version_parse(php_http_version_t *v, const char *st
 
 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 : "");
+       /* different semantics for different versions */
+       if (v->major == 2) {
+               *len = spprintf(str, 0, "%s2%s", STR_PTR(pre), STR_PTR(post));
+       } else  {
+               *len = spprintf(str, 0, "%s%u.%u%s", STR_PTR(pre), v->major, v->minor, STR_PTR(post));
+       }
 }
 
 void php_http_version_dtor(php_http_version_t *v)