X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_api.c;h=5840edacb94123622c91fb3377bf9e06b3b80fda;hb=e26d1af5bcad6068bcd4854693d6a1fa12d7912d;hp=bee02cc01ff592551d911c0ee11bd5b6d006b1a2;hpb=a19a05825d04d634834f7898ec1a5247fdd6095c;p=m6w6%2Fext-http diff --git a/http_api.c b/http_api.c index bee02cc..5840eda 100644 --- a/http_api.c +++ b/http_api.c @@ -564,7 +564,7 @@ PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode PHP_HTTP_API inline int _http_is_range_request(TSRMLS_D) { return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), - "HTTP_RANGE", strlen("HTTP_RANGE") + 1); + "HTTP_RANGE", sizeof("HTTP_RANGE")); } /* }}} */ @@ -1036,13 +1036,13 @@ PHP_HTTP_API http_range_status _http_get_request_ranges(zval *zranges, HTTP_GSC(zrange, "HTTP_RANGE", RANGE_NO); range = Z_STRVAL_P(zrange); - if (strncmp(range, "bytes=", strlen("bytes="))) { + if (strncmp(range, "bytes=", sizeof("bytes=") - 1)) { php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes="); return RANGE_NO; } ptr = &begin; - range += strlen("bytes="); + range += sizeof("bytes=") - 1; do { switch (c = *(range++)) @@ -1464,8 +1464,8 @@ PHP_HTTP_API STATUS _http_parse_headers(char *header, int header_len, zval *arra if (!strncmp(header, "HTTP/1.", 7)) { char *end = strstr(header, HTTP_CRLF); add_assoc_stringl(array, "Status", - header + strlen("HTTP/1.x "), - end - (header + strlen("HTTP/1.x ")), 1); + header + sizeof("HTTP/1.x ") - 1, + end - (header + sizeof("HTTP/1.x ") - 1), 1); header = end + 2; } @@ -1588,4 +1588,4 @@ PHP_HTTP_API STATUS _http_auth_credentials(char **user, char **pass TSRMLS_DC) * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ - +