{
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);
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));
- 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 {
void *s = NULL;
HashTable ranges;
http_range_status range_status;
- int cache_etag = http_interrupt_ob_etaghandler();
if (!data_ptr) {
return FAILURE;
/* 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)) {
+ 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);
}
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)) {
+ 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;
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);
}