#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-
#include "php.h"
+
+#include "SAPI.h"
#include "php_streams.h"
+#include "php_output.h"
#include "ext/standard/md5.h"
+#include "ext/standard/sha1.h"
#include "php_http.h"
#include "php_http_std_defs.h"
+#include "php_http_api.h"
#include "php_http_cache_api.h"
#include "php_http_send_api.h"
-#include "php_http_api.h"
#include "php_http_date_api.h"
+#ifdef HTTP_HAVE_MHASH
+# include <mhash.h>
+#endif
+
ZEND_EXTERN_MODULE_GLOBALS(http);
/* {{{ char *http_etag(void *, size_t, http_send_mode) */
PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC)
{
+ php_stream_statbuf ssb;
char ssb_buf[128] = {0};
- unsigned char digest[16];
- PHP_MD5_CTX ctx;
- char *new_etag = ecalloc(1, 33);
-
- PHP_MD5Init(&ctx);
-
+ size_t ssb_len;
+ void *ctx = http_etag_init();
+
switch (data_mode)
{
case SEND_DATA:
- PHP_MD5Update(&ctx, data_ptr, data_len);
+ http_etag_update(ctx, data_ptr, data_len);
break;
case SEND_RSRC:
- if (!HTTP_G(ssb).sb.st_ino) {
- if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) {
- return NULL;
- }
+ {
+ if (php_stream_stat((php_stream *) data_ptr, &ssb)) {
+ efree(ctx);
+ return NULL;
}
- snprintf(ssb_buf, 127, "%ld=%ld=%ld",
- HTTP_G(ssb).sb.st_mtime,
- HTTP_G(ssb).sb.st_ino,
- HTTP_G(ssb).sb.st_size
- );
- PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+ ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
+ http_etag_update(ctx, ssb_buf, ssb_len);
+ }
break;
default:
- efree(new_etag);
- return NULL;
+ {
+ if (php_stream_stat_path((char *) data_ptr, &ssb)) {
+ efree(ctx);
+ return NULL;
+ }
+ ssb_len = snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
+ http_etag_update(ctx, ssb_buf, ssb_len);
+ }
break;
}
- PHP_MD5Final(digest, &ctx);
- make_digest(new_etag, digest);
-
- return new_etag;
+ return http_etag_finish(ctx);
}
/* }}} */
-/* {{{ time_t http_lmod(void *, http_send_mode) */
-PHP_HTTP_API time_t _http_lmod(const void *data_ptr, http_send_mode data_mode TSRMLS_DC)
+/* {{{ time_t http_last_modified(void *, http_send_mode) */
+PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode data_mode TSRMLS_DC)
{
+ php_stream_statbuf ssb;
+
switch (data_mode)
{
- case SEND_DATA:
- {
- return time(NULL);
- }
-
- case SEND_RSRC:
- {
- php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb));
- return HTTP_G(ssb).sb.st_mtime;
- }
-
- default:
- {
- php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb));
- return HTTP_G(ssb).sb.st_mtime;
- }
+ case SEND_DATA: return time(NULL);
+ case SEND_RSRC: return php_stream_stat((php_stream *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime;
+ default: return php_stream_stat_path((char *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime;
}
}
/* }}} */
-/* {{{ zend_bool http_modified_match(char *, time_t) */
-PHP_HTTP_API zend_bool _http_modified_match_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC)
+/* {{{ zend_bool http_match_last_modified(char *, time_t) */
+PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC)
{
zend_bool retval;
zval *zmodified;
}
/* }}} */
-/* {{{ zend_bool http_etag_match(char *, char *) */
-PHP_HTTP_API zend_bool _http_etag_match_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC)
+/* {{{ zend_bool http_match_etag(char *, char *) */
+PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC)
{
zval *zetag;
char *quoted_etag;
PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified,
time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC)
{
- if (cc_len) {
- http_send_cache_control(cache_control, cc_len);
+ char *sent_header = NULL;
+
+ if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
+ return FAILURE;
}
- if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) {
- if (SUCCESS == http_send_status(304)) {
- zend_bailout();
- } else {
- http_error(E_WARNING, HTTP_E_HEADER, "Could not send 304 Not Modified");
- return FAILURE;
- }
+ if (SUCCESS != http_send_last_modified_ex(send_modified, &sent_header)) {
+ return FAILURE;
}
- return http_send_last_modified(send_modified);
+
+ if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) {
+ http_exit_ex(304, sent_header, NULL, 0);
+ } else {
+ STR_FREE(sent_header);
+ }
+
+ return SUCCESS;
}
/* }}} */
PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len,
const char *cache_control, size_t cc_len TSRMLS_DC)
{
- if (cc_len) {
- http_send_cache_control(cache_control, cc_len);
+ char *sent_header = NULL;
+
+ if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
+ return FAILURE;
}
if (etag_len) {
- http_send_etag(etag, etag_len);
- if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
- if (SUCCESS == http_send_status(304)) {
- zend_bailout();
- } else {
- http_error(E_WARNING, HTTP_E_HEADER, "Could not send 304 Not Modified");
- return FAILURE;
- }
+ if (SUCCESS != http_send_etag_ex(etag, etag_len, &sent_header)) {
+ return FAILURE;
+ }
+ if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+ http_exit_ex(304, sent_header, NULL, 0);
+ } else {
+ STR_FREE(sent_header);
}
+ return SUCCESS;
}
/* if no etag is given and we didn't already start ob_etaghandler -- start it */
- if (!HTTP_G(etag_started)) {
- if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) {
- HTTP_G(etag_started) = 1;
- return SUCCESS;
- } else {
- http_error(E_WARNING, HTTP_E_OBUFFER, "Could not start ob_etaghandler");
- return FAILURE;
- }
+ if (HTTP_G(etag).started) {
+ return SUCCESS;
+ }
+
+ if (HTTP_G(etag).started = (SUCCESS == php_start_ob_buffer_named("ob_etaghandler", HTTP_SENDBUF_SIZE, 1 TSRMLS_CC))) {
+ return SUCCESS;
+ } else {
+ return FAILURE;
}
- return SUCCESS;
}
/* }}} */
+/* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */
+PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
+ char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
+{
+ if (mode & PHP_OUTPUT_HANDLER_START) {
+ if (HTTP_G(etag).started) {
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once");
+ return;
+ }
+ HTTP_G(etag).started = 1;
+ HTTP_G(etag).ctx = http_etag_init();
+ }
+
+ http_etag_update(HTTP_G(etag).ctx, output, output_len);
+
+ if (mode & PHP_OUTPUT_HANDLER_END) {
+ char *etag = http_etag_finish(HTTP_G(etag).ctx);
+
+ /* just do that if desired */
+ if (HTTP_G(etag).started) {
+ char *sent_header = NULL;
+
+ http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL));
+ http_send_etag_ex(etag, strlen(etag), &sent_header);
+
+ if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+ efree(etag);
+ http_exit_ex(304, sent_header, NULL, 0);
+ } else {
+ STR_FREE(sent_header);
+ }
+ }
+ efree(etag);
+ }
+
+ *handled_output_len = output_len;
+ *handled_output = estrndup(output, output_len);
+}
+/* }}} */
/*
* Local variables:
projects / m6w6 / ext-http / blobdiff