/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
ZEND_EXTERN_MODULE_GLOBALS(http);
+static inline int eol_match(char **line, int *EOL_len)
+{
+ char *ptr = *line;
+
+ while (0x20 == *ptr) ++ptr;
+
+ if (ptr == http_locate_eol(*line, EOL_len)) {
+ *line = ptr;
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
/* {{{ char *http_encoding_dechunk(char *, size_t, char **, size_t *) */
PHP_HTTP_API const char *_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC)
{
* - chunk size is not followed by (CR)LF|NUL
*/
if ( (n_ptr == e_ptr) || (chunk_len < 0) || (chunk_len > rest) ||
- (*n_ptr && (eol_mismatch = (n_ptr != http_locate_eol(e_ptr, &EOL_len))))) {
+ (*n_ptr && (eol_mismatch = !eol_match(&n_ptr, &EOL_len)))) {
/* don't fail on apperently not encoded data */
if (e_ptr == encoded) {
memcpy(*decoded, encoded, encoded_len);
efree(*decoded);
if (eol_mismatch) {
if (EOL_len == 2) {
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%X 0x%X)", *n_ptr, *(n_ptr + 1));
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%02X 0x%02X)", *n_ptr, *(n_ptr + 1));
} else {
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0A; got: 0x%X)", *n_ptr);
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0A; got: 0x%02X)", *n_ptr);
}
} else {
- char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n "));
- http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded);
+ char *error = estrndup(e_ptr, strcspn(n_ptr, "\r\n "));
+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %ld of %lu", error, (long) (n_ptr - encoded), (unsigned long) encoded_len);
efree(error);
}
return NULL;
*buf_ptr = emalloc(HTTP_ENCODING_BUFLEN(data_len) + sizeof(http_encoding_gzip_header) + HTTP_ENCODING_SAFPAD);
memcpy(*buf_ptr, http_encoding_gzip_header, sizeof(http_encoding_gzip_header));
- Z->next_out = *buf_ptr + sizeof(http_encoding_gzip_header);
+ Z->next_out = (Bytef *) *buf_ptr + sizeof(http_encoding_gzip_header);
}
inline void http_init_deflate_buffer(z_stream *Z, const char *data, size_t data_len, char **buf_ptr)
Z->avail_out = HTTP_ENCODING_BUFLEN(data_len) - 1;
Z->next_out = emalloc(HTTP_ENCODING_BUFLEN(data_len));
- *buf_ptr = Z->next_out;
+ *buf_ptr = (char *) Z->next_out;
}
inline void http_init_uncompress_buffer(size_t data_len, char **buf_ptr, size_t *buf_len, int *iteration)
Z->next_in = (Bytef *) data;
Z->avail_in = data_len;
Z->avail_out = *buf_len;
- Z->next_out = *buf_ptr;
+ Z->next_out = (Bytef *) *buf_ptr;
}
inline size_t http_finish_buffer(size_t buf_len, char **buf_ptr)
cmp += (unsigned) ((data[offset-1] & 0xFF) << 8);
crc = crc32(0L, Z_NULL, 0);
- crc = crc32(crc, data, sizeof(http_encoding_gzip_header));
+ crc = crc32(crc, (const Bytef *) data, sizeof(http_encoding_gzip_header));
if (cmp != (crc & 0xFFFF)) {
http_error_ex(error_level TSRMLS_CC, HTTP_E_ENCODING, "GZIP headers CRC checksums so not match (%lu, %lu)", cmp, crc & 0xFFFF);
*encoded = emalloc(*encoded_len = HTTP_ENCODING_BUFLEN(data_len));
- if (Z_OK == (status = compress2(*encoded, encoded_len, data, data_len, level))) {
+ if (Z_OK == (status = compress2((Bytef *) *encoded, (uLongf *) encoded_len, (const Bytef *) data, data_len, level))) {
http_finish_buffer(*encoded_len, encoded);
return SUCCESS;
}
do {
http_init_uncompress_buffer(data_len, decoded, decoded_len, &max);
- if (Z_OK == (status = uncompress(*decoded, decoded_len, data, data_len))) {
+ if (Z_OK == (status = uncompress((Bytef *) *decoded, (uLongf *) decoded_len, (const Bytef *) data, data_len))) {
http_finish_buffer(*decoded_len, decoded);
return SUCCESS;
}
s->Z.next_in = (Bytef *) data;
s->Z.avail_in = data_len;
- s->Z.next_out = *encoded;
+ s->Z.next_out = (Bytef *) *encoded;
s->Z.avail_out = *encoded_len;
status = deflate(&s->Z, Z_SYNC_FLUSH);
*encoded_len = 1024;
*encoded = emalloc(*encoded_len);
- s->Z.next_out = *encoded;
+ s->Z.next_out = (Bytef *) *encoded;
s->Z.avail_out = *encoded_len;
if (Z_STREAM_END != (status = deflate(&s->Z, Z_FINISH)) || Z_OK != (status = deflateEnd(&s->Z))) {