#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_send_api.h"
#include "php_http_date_api.h"
-ZEND_EXTERN_MODULE_GLOBALS(http);
+#ifdef HTTP_HAVE_MHASH
+# include <mhash.h>
+#endif
-/* {{{ STATUS http_cache_exit(char *, zend_bool) */
-STATUS _http_cache_exit_ex(char *cache_token, zend_bool etag, zend_bool free_token TSRMLS_DC)
-{
- if (HTTP_G(log).cache && strlen(HTTP_G(log).cache)) {
- php_stream *log = php_stream_open_wrapper(HTTP_G(log).cache, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
-
- if (log) {
- time_t now;
- struct tm nowtm;
- char datetime[128];
-
- time(&now);
- strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm));
- php_stream_printf(log TSRMLS_CC, "%s [%s] %32s %s\n", datetime, etag ? "ETAG":"LMOD", cache_token, SG(request_info).request_uri);
- php_stream_close(log);
- }
- }
- if (free_token && cache_token) {
- efree(cache_token);
- }
- return http_exit_ex(304, NULL, 0);
-}
-/* }}} */
+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 (php_stream_stat((php_stream *) data_ptr, &ssb)) {
- efree(new_etag);
- return NULL;
- }
-
- snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
- PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+ if (php_stream_stat((php_stream *) 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;
default:
{
- if (php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &ssb)) {
- efree(new_etag);
- return NULL;
- }
-
- snprintf(ssb_buf, 127, "%ld=%ld=%ld", ssb.sb.st_mtime, ssb.sb.st_ino, ssb.sb.st_size);
- PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf));
+ 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);
}
/* }}} */
{
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(Z_STRVAL_P((zval *) data_ptr), &ssb) ? 0 : ssb.sb.st_mtime;
+ default: return php_stream_stat_path((char *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime;
}
}
/* }}} */
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)
{
+ char *sent_header = NULL;
+
if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
return FAILURE;
}
- if (SUCCESS != http_send_last_modified(send_modified)) {
+ if (SUCCESS != http_send_last_modified_ex(send_modified, &sent_header)) {
return FAILURE;
}
if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) {
- return http_cache_exit(http_date(last_modified), 0);
+ 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)
{
+ char *sent_header = NULL;
+
if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) {
return FAILURE;
}
if (etag_len) {
- if (SUCCESS != http_send_etag(etag, etag_len)) {
+ if (SUCCESS != http_send_etag_ex(etag, etag_len, &sent_header)) {
return FAILURE;
}
- if (!http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
- return SUCCESS;
+ if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) {
+ http_exit_ex(304, sent_header, NULL, 0);
+ } else {
+ STR_FREE(sent_header);
}
- return http_cache_exit_ex((char *)etag, 1, 0);
+ return SUCCESS;
}
/* if no etag is given and we didn't already start ob_etaghandler -- start it */
PHP_HTTP_API void _http_ob_etaghandler(char *output, uint output_len,
char **handled_output, uint *handled_output_len, int mode TSRMLS_DC)
{
- char etag[33] = { 0 };
- unsigned char digest[16];
-
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;
- PHP_MD5Init(&HTTP_G(etag).md5ctx);
+ HTTP_G(etag).ctx = http_etag_init();
}
- PHP_MD5Update(&HTTP_G(etag).md5ctx, output, output_len);
+ http_etag_update(HTTP_G(etag).ctx, output, output_len);
if (mode & PHP_OUTPUT_HANDLER_END) {
- PHP_MD5Final(digest, &HTTP_G(etag).md5ctx);
-
+ char *etag = http_etag_finish(HTTP_G(etag).ctx);
+
/* just do that if desired */
if (HTTP_G(etag).started) {
- make_digest(etag, digest);
- http_send_header("Cache-Control: " HTTP_DEFAULT_CACHECONTROL);
- http_send_etag(etag, 32);
-
+ 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)) {
- http_cache_exit_ex(etag, 1, 0);
+ efree(etag);
+ http_exit_ex(304, sent_header, NULL, 0);
+ } else {
+ STR_FREE(sent_header);
}
}
+ efree(etag);
}
*handled_output_len = output_len;
projects / m6w6 / ext-http / blobdiff