- portable ctype (http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=34632)

[m6w6/ext-http] / http_info_api.c

diff --git a/http_info_api.c b/http_info_api.c
index 0f22902bb2e020fcc8744280dc16c7f9cee1a55d..7cf9cc6eb0a6844b14d3c7b0dddd439db6db8286 100644 (file)
--- a/http_info_api.c
+++ b/http_info_api.c
@@ -97,8 +97,8 @@ PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info,
         */
        if (    (!(http = php_memnstr((char *) pre_header, "HTTP/1.", lenof("HTTP/1."), (char *)end))) || 
                        (!(http < end)) ||
         */
        if (    (!(http = php_memnstr((char *) pre_header, "HTTP/1.", lenof("HTTP/1."), (char *)end))) || 
                        (!(http < end)) ||

-                       (!isdigit(http[lenof("HTTP/1.")])) ||
-                       (http[lenof("HTTP/1.1")] && (!isspace(http[lenof("HTTP/1.1")])))) {
+                       (!HTTP_IS_CTYPE(digit, http[lenof("HTTP/1.")])) ||
+                       (http[lenof("HTTP/1.1")] && (!HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) {

                if (!silent) {
                        http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid or missing HTTP/1.x protocol identification");
                }
                if (!silent) {
                        http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid or missing HTTP/1.x protocol identification");
                }