/* $Id$ */
+#define _WINSOCKAPI_
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#ifdef HAVE_CONFIG_H
static inline char *_http_etag(char **new_etag, const void *data_ptr,
const size_t data_len, const http_send_mode data_mode TSRMLS_DC)
{
- char ssb_buf[127], digest[16];
+ char ssb_buf[127];
+ unsigned char digest[16];
PHP_MD5_CTX ctx;
PHP_MD5Init(&ctx);
break;
case SEND_DATA:
- return len == php_body_write(
- Z_STRVAL_P((zval *) data) + begin, len TSRMLS_CC)
+ return len == php_body_write(((char *)data) + begin, len TSRMLS_CC)
? SUCCESS : FAILURE;
break;
if (key_type == HASH_KEY_IS_STRING) {
zend_hash_get_current_key(Z_ARRVAL_P(zoption), &header_key, NULL, 0);
zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val);
- snprintf(header, 1024, "%s: %s", header_key, Z_STRVAL_PP(header_val));
+ snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val));
headers = curl_slist_append(headers, header);
zend_hash_move_forward(Z_ARRVAL_P(zoption));
}
{
double d;
if (CURLE_OK == curl_easy_getinfo(ch, i, &d)) {
- add_assoc_double(array, key, (double) d);
+ add_assoc_double(array, key, d);
}
}
break;
{
long l;
if (CURLE_OK == curl_easy_getinfo(ch, i, &l)) {
- add_assoc_long(array, key, (long) l);
+ add_assoc_long(array, key, l);
}
}
break;
/* {{{ static inline http_curl_getinfo(CURL, HashTable *) */
static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC)
{
- zval *array;
-
- MAKE_STD_ZVAL(array);
- Z_ARRVAL_P(array) = info;
+ zval array;
+ Z_ARRVAL(array) = info;
-#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , array)
+#define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array)
/* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */
INFO(EFFECTIVE_URL);
/* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
/* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
INFO(PROXYAUTH_AVAIL);
#undef INFO
- efree(array);
}
/* }}} */
PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
{
struct tm *gmtime, tmbuf;
- char *date = ecalloc(1, 30);
+ char *date = ecalloc(31, 1);
gmtime = php_gmtime_r(&t, &tmbuf);
snprintf(date, 30,
int header_len;
char *etag_header;
- header_len = strlen("ETag: \"\"") + etag_len + 1;
- etag_header = (char *) emalloc(header_len);
- snprintf(etag_header, header_len, "ETag: \"%s\"", etag);
+ header_len = sizeof("ETag: \"\"") + etag_len + 1;
+ etag_header = ecalloc(header_len, 1);
+ sprintf(etag_header, "ETag: \"%s\"", etag);
ret = http_send_header(etag_header);
efree(etag_header);
+ if (!etag_len){
+ php_error_docref(NULL TSRMLS_CC,E_ERROR,
+ "Sending empty Etag (previous: %s)\n", HTTP_G(etag));
+ return FAILURE;
+ }
/* remember */
if (HTTP_G(etag)) {
efree(HTTP_G(etag));
if (strncmp(range, "bytes=", strlen("bytes="))) {
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Range header misses bytes=");
- return RANGE_ERR;
+ return RANGE_NO;
}
ptr = &begin;
break;
default:
- return RANGE_ERR;
+ return RANGE_NO;
break;
}
} while (c != 0);
PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
const http_send_mode data_mode TSRMLS_DC)
{
- char *new_etag = NULL;
int is_range_request = http_is_range_request();
if (!data_ptr) {
/* etag handling */
if (HTTP_G(etag_started)) {
- new_etag = (char *) emalloc(33);
-
- /* never ever use the output to compute the ETag if http_send() is used */
+ char *etag = ecalloc(33, 1);
+ /* interrupt */
HTTP_G(etag_started) = 0;
+ /* never ever use the output to compute the ETag if http_send() is used */
php_end_ob_buffer(0, 0 TSRMLS_CC);
- if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
- efree(new_etag);
+ if (NULL == http_etag(&etag, data_ptr, data_size, data_mode)) {
+ efree(etag);
return FAILURE;
}
/* send 304 Not Modified if etag matches */
- if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
- efree(new_etag);
+ if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+ efree(etag);
return http_send_status(304);
}
- http_send_etag(new_etag, 32);
- efree(new_etag);
+ http_send_etag(etag, 32);
+ efree(etag);
}
/* send 304 Not Modified if last-modified matches*/
return FAILURE;
}
- return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
+ return http_send(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), SEND_DATA);
}
/* }}} */
{
char *colon = NULL, *line = NULL, *begin = header;
- if (header_len < 8) {
+ if (header_len < 2) {
return FAILURE;
}
while (header_len >= (line - begin)) {
int value_len = 0;
-
+
switch (*line++)
{
case 0:
--value_len; /* we don't have CR so value length is one char less */
case '\n':
if (colon && ((!(*line - 1)) || ((*line != ' ') && (*line != '\t')))) {
-
+
/* skip empty key */
if (header != colon) {
char *key = estrndup(header, colon - header);
value_len += line - colon - 1;
-
+
/* skip leading ws */
while (isspace(*(++colon))) --value_len;
/* skip trailing ws */
while (isspace(colon[value_len - 1])) --value_len;
-
+
if (value_len < 1) {
/* hm, empty header? */
- add_assoc_stringl(array, key, "", 0, 0);
+ add_assoc_stringl(array, key, "", 0, 1);
} else {
add_assoc_stringl(array, key, colon, value_len, 1);
}
efree(key);
}
-
+
colon = NULL;
value_len = 0;
header += line - header;
PHP_HTTP_API void _http_get_request_headers(zval *array TSRMLS_DC)
{
char *key;
-
+
for ( zend_hash_internal_pointer_reset(HTTP_SERVER_VARS);
zend_hash_get_current_key(HTTP_SERVER_VARS, &key, NULL, 0) != HASH_KEY_NON_EXISTANT;
zend_hash_move_forward(HTTP_SERVER_VARS)) {