| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
/* $Id$ */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
+#define HTTP_WANT_ZLIB
#define HTTP_WANT_MAGIC
#include "php_http.h"
-#include "SAPI.h"
#include "php_streams.h"
#include "ext/standard/php_lcg.h"
#include "php_http_headers_api.h"
#include "php_http_send_api.h"
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
-#define http_flush(d, l) _http_flush((d), (l) SRMLS_CC)
+#define http_flush(d, l) _http_flush(NULL, (d), (l) TSRMLS_CC)
/* {{{ static inline void http_flush() */
-static inline void _http_flush(const char *data, size_t data_len TSRMLS_DC)
+static inline void _http_flush(void *nothing, const char *data, size_t data_len TSRMLS_DC)
{
PHPWRITE(data, data_len);
php_end_ob_buffer(1, 1 TSRMLS_CC);
#define HTTP_NANOSEC (1000 * 1000 * 1000)
#define HTTP_DIFFSEC (0.001)
- if (HTTP_G(send).throttle_delay >= HTTP_DIFFSEC) {
+ if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) {
#if defined(PHP_WIN32)
- Sleep((DWORD) HTTP_MSEC(HTTP_G(send).throttle_delay));
+ Sleep((DWORD) HTTP_MSEC(HTTP_G->send.throttle_delay));
#elif defined(HAVE_USLEEP)
- usleep(HTTP_USEC(HTTP_G(send).throttle_delay));
+ usleep(HTTP_USEC(HTTP_G->send.throttle_delay));
#elif defined(HAVE_NANOSLEEP)
struct timespec req, rem;
- req.tv_sec = (time_t) HTTP_G(send).throttle_delay;
- req.tv_nsec = HTTP_NSEC(HTTP_G(send).throttle_delay) % HTTP_NANOSEC;
+ req.tv_sec = (time_t) HTTP_G->send.throttle_delay;
+ req.tv_nsec = HTTP_NSEC(HTTP_G->send.throttle_delay) % HTTP_NANOSEC;
while (nanosleep(&req, &rem) && (errno == EINTR) && (HTTP_NSEC(rem.tv_sec) + rem.tv_nsec) > HTTP_NSEC(HTTP_DIFFSEC))) {
req.tv_sec = rem.tv_sec;
#define http_send_response_start(b, cl) _http_send_response_start((b), (cl) TSRMLS_CC)
static inline void _http_send_response_start(void **buffer, size_t content_length TSRMLS_DC)
{
- if (http_encoding_response_start(content_length)) {
+ int encoding;
+
+ if ((encoding = http_encoding_response_start(content_length))) {
#ifdef HTTP_HAVE_ZLIB
- char *encoded;
- size_t encoded_len;
- http_encoding_stream *s = emalloc(sizeof(http_encoding_stream));
-
- http_encoding_stream_init(s, HTTP_G(send).gzip_encoding == HTTP_ENCODING_GZIP, -1, &encoded, &encoded_len);
- phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
- STR_FREE(encoded);
- *buffer = s;
+ *buffer = http_encoding_deflate_stream_init(NULL,
+ (encoding == HTTP_ENCODING_GZIP) ?
+ HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB);
#endif
}
}
#define http_send_response_data_plain(b, d, dl) _http_send_response_data_plain((b), (d), (dl) TSRMLS_CC)
static inline void _http_send_response_data_plain(void **buffer, const char *data, size_t data_len TSRMLS_DC)
{
- if (HTTP_G(send).gzip_encoding) {
+ if (HTTP_G->send.deflate.encoding) {
#ifdef HTTP_HAVE_ZLIB
char *encoded;
size_t encoded_len;
http_encoding_stream *s = *((http_encoding_stream **) buffer);
- http_encoding_stream_update(s, data, data_len, &encoded, &encoded_len);
- phpstr_chunked_output(&s->storage, encoded, encoded_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
+ http_encoding_deflate_stream_update(s, data, data_len, &encoded, &encoded_len);
+ phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
efree(encoded);
#else
http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
#endif
} else {
- phpstr_chunked_output((phpstr **) buffer, data, data_len, HTTP_G(send).buffer_size, _http_flush TSRMLS_CC);
+ phpstr_chunked_output((phpstr **) buffer, data, data_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC);
}
}
/* }}} */
-#define HTTP_CHUNK_AVAIL(len, cs) ((len -= cs) >= 0)
/* {{{ http_send_response_data_fetch */
#define http_send_response_data_fetch(b, d, l, m, s, e) _http_send_response_data_fetch((b), (d), (l), (m), (s), (e) TSRMLS_CC)
static inline void _http_send_response_data_fetch(void **buffer, const void *data, size_t data_len, http_send_mode mode, size_t begin, size_t end TSRMLS_DC)
{
- long len = end - begin, chunk_size = 40960;
+ char *buf;
+ long got, len = end - begin;
switch (mode)
{
php_stream *s = (php_stream *) data;
if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) {
- char *buf = emalloc(chunk_size);
-
- while (HTTP_CHUNK_AVAIL(len, chunk_size)) {
- http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size));
- }
- /* read & write left over */
- if (len) {
- http_send_response_data_plain(buffer, buf, php_stream_read(s, buf, chunk_size + len));
+ buf = emalloc(HTTP_SENDBUF_SIZE);
+
+ while (len > 0) {
+ got = php_stream_read(s, buf, MIN(len, HTTP_SENDBUF_SIZE));
+ http_send_response_data_plain(buffer, buf, got);
+ len -= got;
}
-
+
efree(buf);
}
}
case SEND_DATA:
{
- char *s = (char *) data + begin;
-
- while (HTTP_CHUNK_AVAIL(len, chunk_size)) {
- http_send_response_data_plain(buffer, s, chunk_size);
- s += chunk_size;
- }
- /* write left over */
- if (len) {
- http_send_response_data_plain(buffer, s, chunk_size + len);
+ buf = (char *) data + begin;
+
+ while (len > 0) {
+ got = MIN(len, HTTP_SENDBUF_SIZE);
+ http_send_response_data_plain(buffer, buf, got);
+ len -= got;
+ buf += got;
}
}
break;
#define http_send_response_finish(b) _http_send_response_finish((b) TSRMLS_CC)
static inline void _http_send_response_finish(void **buffer TSRMLS_DC)
{
- if (HTTP_G(send).gzip_encoding) {
+ if (HTTP_G->send.deflate.encoding) {
#ifdef HTTP_HAVE_ZLIB
char *encoded = NULL;
size_t encoded_len = 0;
http_encoding_stream *s = *((http_encoding_stream **) buffer);
- http_encoding_stream_finish(s, &encoded, &encoded_len);
- phpstr_chunked_output(&s->storage, encoded, encoded_len, 0, _http_flush TSRMLS_CC);
+ http_encoding_deflate_stream_finish(s, &encoded, &encoded_len);
+ phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush, NULL TSRMLS_CC);
+ http_encoding_deflate_stream_free(&s);
STR_FREE(encoded);
- efree(s);
#else
http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug");
#endif
} else {
- phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush TSRMLS_CC);
+ phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush, NULL TSRMLS_CC);
}
}
/* }}} */
+/* {{{ */
+PHP_MINIT_FUNCTION(http_send)
+{
+ HTTP_LONG_CONSTANT("HTTP_REDIRECT", HTTP_REDIRECT);
+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_PERM", HTTP_REDIRECT_PERM);
+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_FOUND", HTTP_REDIRECT_FOUND);
+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_POST", HTTP_REDIRECT_POST);
+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_PROXY", HTTP_REDIRECT_PROXY);
+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_TEMP", HTTP_REDIRECT_TEMP);
+
+ return SUCCESS;
+}
+/* }}} */
+
/* {{{ STATUS http_send_header(char *, char *, zend_bool) */
PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, const char *value, size_t value_len, zend_bool replace, char **sent_header TSRMLS_DC)
efree(date);
/* remember */
- HTTP_G(send).last_modified = t;
+ HTTP_G->send.last_modified = t;
return ret;
}
{
STATUS status;
char *etag_header;
+ size_t etag_header_len;
if (!etag_len){
- http_error_ex(HE_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G(send).unquoted_etag);
+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G->send.unquoted_etag);
return FAILURE;
}
+ etag_header_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag);
+ status = http_send_header_string_ex(etag_header, etag_header_len, 1);
+
/* remember */
- STR_SET(HTTP_G(send).unquoted_etag, estrndup(etag, etag_len));
+ STR_SET(HTTP_G->send.unquoted_etag, estrndup(etag, etag_len));
- etag_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag);
- status = http_send_header_string_ex(etag_header, etag_len, 1);
-
if (sent_header) {
*sent_header = etag_header;
} else {
HTTP_CHECK_CONTENT_TYPE(content_type, return FAILURE);
/* remember for multiple ranges */
- STR_FREE(HTTP_G(send).content_type);
- HTTP_G(send).content_type = estrndup(content_type, ct_len);
+ STR_FREE(HTTP_G->send.content_type);
+ HTTP_G->send.content_type = estrndup(content_type, ct_len);
return http_send_header_ex("Content-Type", lenof("Content-Type"), content_type, ct_len, 1, NULL);
}
void *s = NULL;
HashTable ranges;
http_range_status range_status;
- int cache_etag = http_interrupt_ob_etaghandler();
if (!data_ptr) {
return FAILURE;
case RANGE_OK:
{
/* Range Request - only send ranges if entity hasn't changed */
- if ( http_match_etag_ex("HTTP_IF_MATCH", HTTP_G(send).unquoted_etag, 0) &&
- http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G(send).last_modified, 0) &&
- http_match_last_modified_ex("HTTP_UNLESS_MODIFIED_SINCE", HTTP_G(send).last_modified, 0)) {
+ if ( http_got_server_var("HTTP_IF_RANGE") &&
+ !http_match_etag("HTTP_IF_RANGE", HTTP_G->send.unquoted_etag) &&
+ !http_match_last_modified("HTTP_IF_RANGE", HTTP_G->send.last_modified)) {
+ /* fallthrough to send full entity with 200 Ok */
+ no_cache = 1;
+ } else if ( !http_match_etag_ex("HTTP_IF_MATCH", HTTP_G->send.unquoted_etag, 0) ||
+ !http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G->send.last_modified, 0) ||
+ !http_match_last_modified_ex("HTTP_UNLESS_MODIFIED_SINCE", HTTP_G->send.last_modified, 0)) {
+ /* 412 Precondition failed */
+ zend_hash_destroy(&ranges);
+ http_send_status(412);
+ return FAILURE;
+ } else if (zend_hash_num_elements(&ranges) == 1) {
+ /* single range */
+ zval **range, **begin, **end;
- if (zend_hash_num_elements(&ranges) == 1) {
- /* single range */
- zval **range, **begin, **end;
-
- if ( SUCCESS == zend_hash_index_find(&ranges, 0, (void **) &range) &&
- SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) &&
- SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
- char range_header_str[256];
- size_t range_header_len;
-
- range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
- http_send_status_header_ex(206, range_header_str, range_header_len, 1);
- http_send_response_start(&s, Z_LVAL_PP(end)-Z_LVAL_PP(begin)+1);
- http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
- http_send_response_finish(&s);
- zend_hash_destroy(&ranges);
- return SUCCESS;
- }
+ if ( SUCCESS != zend_hash_index_find(&ranges, 0, (void *) &range) ||
+ SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) ||
+ SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
+ /* this should never happen */
+ zend_hash_destroy(&ranges);
+ http_send_status(500);
+ return FAILURE;
} else {
- /* multi range */
- HashPosition pos;
- zval **range, **begin, **end;
- const char *content_type = HTTP_G(send).content_type;
- char boundary_str[32], range_header_str[256];
- size_t boundary_len, range_header_len;
-
- boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) time(NULL), (float) php_combined_lcg(TSRMLS_C));
- range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str);
+ char range_header_str[256];
+ size_t range_header_len;
+ range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
http_send_status_header_ex(206, range_header_str, range_header_len, 1);
- http_send_response_start(&s, 0);
-
- if (!content_type) {
- content_type = "application/x-octetstream";
- }
-
- FOREACH_HASH_VAL(pos, &ranges, range) {
- if ( SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void **) &begin) &&
- SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void **) &end)) {
- char preface_str[512];
- size_t preface_len;
+ http_send_response_start(&s, Z_LVAL_PP(end)-Z_LVAL_PP(begin)+1);
+ http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
+ http_send_response_finish(&s);
+ zend_hash_destroy(&ranges);
+ return SUCCESS;
+ }
+ } else {
+ /* multi range */
+ HashPosition pos;
+ zval **range, **begin, **end;
+ const char *content_type = HTTP_G->send.content_type;
+ char boundary_str[32], range_header_str[256];
+ size_t boundary_len, range_header_len;
+
+ boundary_len = snprintf(boundary_str, lenof(boundary_str), "%lu%0.9f", (ulong) HTTP_GET_REQUEST_TIME(), (float) php_combined_lcg(TSRMLS_C));
+ range_header_len = snprintf(range_header_str, lenof(range_header_str), "Content-Type: multipart/byteranges; boundary=%s", boundary_str);
+
+ http_send_status_header_ex(206, range_header_str, range_header_len, 1);
+ http_send_response_start(&s, 0);
+
+ if (!content_type) {
+ content_type = "application/x-octetstream";
+ }
+
+ FOREACH_HASH_VAL(pos, &ranges, range) {
+ if ( SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) &&
+ SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) {
+ char preface_str[512];
+ size_t preface_len;
#define HTTP_RANGE_PREFACE \
HTTP_CRLF "--%s" \
HTTP_CRLF "Content-Type: %s" \
HTTP_CRLF "Content-Range: bytes %ld-%ld/%zu" \
HTTP_CRLF HTTP_CRLF
-
- preface_len = snprintf(preface_str, lenof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
- http_send_response_data_plain(&s, preface_str, preface_len);
- http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
- }
+
+ preface_len = snprintf(preface_str, lenof(preface_str), HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size);
+ http_send_response_data_plain(&s, preface_str, preface_len);
+ http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1);
}
-
- http_send_response_data_plain(&s, HTTP_CRLF "--", lenof(HTTP_CRLF "--"));
- http_send_response_data_plain(&s, boundary_str, boundary_len);
- http_send_response_data_plain(&s, "--", lenof("--"));
-
- http_send_response_finish(&s);
- zend_hash_destroy(&ranges);
- return SUCCESS;
}
+
+ http_send_response_data_plain(&s, HTTP_CRLF "--", lenof(HTTP_CRLF "--"));
+ http_send_response_data_plain(&s, boundary_str, boundary_len);
+ http_send_response_data_plain(&s, "--", lenof("--"));
+
+ http_send_response_finish(&s);
+ zend_hash_destroy(&ranges);
+ return SUCCESS;
}
}
case RANGE_NO:
{
zend_hash_destroy(&ranges);
-
+
/* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */
- if (!no_cache && cache_etag) {
+ if (!no_cache && (http_interrupt_ob_etaghandler() || (HTTP_G->send.unquoted_etag != NULL))) {
char *etag = NULL;
- if ((etag = http_etag(data_ptr, data_size, data_mode))) {
+ if (HTTP_G->send.unquoted_etag) {
+ etag = estrdup(HTTP_G->send.unquoted_etag);
+ }
+
+ if (etag || (etag = http_etag(data_ptr, data_size, data_mode))) {
char *sent_header = NULL;
http_send_etag_ex(etag, strlen(etag), &sent_header);
return http_exit_ex(304, sent_header, NULL, 0);
} else {
STR_FREE(sent_header);
+ /* no caching for Last-Modified if ETags really don't match */
+ no_cache = http_got_server_var("HTTP_IF_NONE_MATCH");
}
efree(etag);
}
}
/* send 304 Not Modified if last modified matches */
- if (!no_cache && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G(send).last_modified)) {
+ if (!no_cache && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) {
char *sent_header = NULL;
- http_send_last_modified_ex(HTTP_G(send).last_modified, &sent_header);
+ http_send_last_modified_ex(HTTP_G->send.last_modified, &sent_header);
return http_exit_ex(304, sent_header, NULL, 0);
}
char *ct = NULL;
#ifdef HTTP_HAVE_MAGIC
+ struct magic_set *magic;
+
+ HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL);
+
/* magic_load() fails if MAGIC_MIME is set because it
cowardly adds .mime to the file name */
- struct magic_set *magic = magic_open(magicmode &~ MAGIC_MIME);
+ magic = magic_open(magicmode &~ MAGIC_MIME);
if (!magic) {
http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode);
break;
default:
+ HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL);
ctype = magic_file(magic, data_ptr);
break;
}
projects / m6w6 / ext-http / blobdiff