}
/* }}} */
+/* {{{ STATUS http_check_method(char *) */
+STATUS _http_check_method_ex(const char *method, const char *methods)
+{
+ const char *found;
+
+ if ( (found = strstr(methods, method)) &&
+ (found == method || !isalpha(found[-1])) &&
+ (!isalpha(found[strlen(method) + 1]))) {
+ return SUCCESS;
+ }
+ return FAILURE;
+}
+/* }}} */
+
/* {{{ zval *http_get_server_var_ex(char *, size_t) */
PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC)
{
/* }}} */
-/* {{{ STATUS http_chunked_decode(char *, size_t, char **, size_t *) */
-PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len,
+/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */
+PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len,
char **decoded, size_t *decoded_len TSRMLS_DC)
{
const char *e_ptr;
e_ptr = encoded;
while (((e_ptr - encoded) - encoded_len) > 0) {
- char hex_len[9] = {0};
+ char *n_ptr;
size_t chunk_len = 0;
- int i = 0;
-
- /* read in chunk size */
- while (isxdigit(*e_ptr)) {
- if (i == 9) {
- http_error_ex(E_WARNING, HTTP_E_PARSE, "Chunk size is too long: 0x%s...", hex_len);
- efree(*decoded);
- return FAILURE;
+
+ chunk_len = strtol(e_ptr, &n_ptr, 16);
+
+ if (n_ptr == e_ptr) {
+ /* don't fail on apperently not encoded data */
+ if (e_ptr == encoded) {
+ memcpy(*decoded, encoded, encoded_len);
+ *decoded_len = encoded_len;
+ return encoded + encoded_len;
+ } else {
+ char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0"));
+ http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
+ efree(error);
+ return NULL;
}
- hex_len[i++] = *e_ptr++;
+ } else {
+ e_ptr = n_ptr;
}
/* reached the end */
- if (!strcmp(hex_len, "0")) {
+ if (!chunk_len) {
break;
}
/* new line */
if (strncmp(e_ptr, HTTP_CRLF, 2)) {
- http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: %x %x)", *e_ptr, *(e_ptr + 1));
+ http_error_ex(E_WARNING, HTTP_E_PARSE,
+ "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *e_ptr, *(e_ptr + 1));
efree(*decoded);
- return FAILURE;
- }
-
- /* hex to long */
- {
- char *error = NULL;
- chunk_len = strtol(hex_len, &error, 16);
- if (error == hex_len) {
- http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size string: '%s'", hex_len);
- efree(*decoded);
- return FAILURE;
- }
+ return NULL;
}
memcpy(d_ptr, e_ptr += 2, chunk_len);
*decoded_len += chunk_len;
}
- return SUCCESS;
+ return e_ptr;
}
/* }}} */
memcpy(*body, real_body, *body_len);
}
- return http_parse_headers_ex(header, real_body ? response_len - *body_len : response_len, headers, 1);
+ return http_parse_headers_ex(header, headers, 1);
}
/* }}} */