| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2011, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
-/* $Id $ */
-
-#include "php_http.h"
-
-#include <main/SAPI.h>
-#include <ext/date/php_date.h>
-#include <ext/standard/php_string.h>
-
+#include "php_http_api.h"
static void set_option(zval *options, const char *name_str, size_t name_len, int type, const void *value_ptr, size_t value_len TSRMLS_DC)
{
PHP_HTTP_API php_http_cache_status_t php_http_env_is_response_cached_by_etag(zval *options, const char *header_str, size_t header_len TSRMLS_DC)
{
- int ret, free_etag = 0;
- char *header, *etag;
+ int ret = 0, free_etag = 0;
+ char *header = NULL, *etag;
zval *zetag, *zbody = NULL;
- if ( !(header = php_http_env_get_request_header(header_str, header_len TSRMLS_CC))
- || !(zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))
+ if ( !(zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))
|| !(Z_TYPE_P(zbody) == IS_OBJECT)
|| !instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)
) {
- STR_FREE(header);
if (zbody) {
zval_ptr_dtor(&zbody);
}
if (zetag && Z_STRLEN_P(zetag)) {
etag = Z_STRVAL_P(zetag);
- } else {
- etag = php_http_message_body_etag(((php_http_message_body_object_t *) zend_object_store_get_object(zbody TSRMLS_CC))->body);
+ } else if ((etag = php_http_message_body_etag(((php_http_message_body_object_t *) zend_object_store_get_object(zbody TSRMLS_CC))->body))) {
set_option(options, ZEND_STRL("etag"), IS_STRING, etag, strlen(etag) TSRMLS_CC);
free_etag = 1;
}
zval_ptr_dtor(&zetag);
}
- ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD);
+ if (etag && (header = php_http_env_get_request_header(header_str, header_len, NULL TSRMLS_CC))) {
+ ret = php_http_match(header, etag, PHP_HTTP_MATCH_WORD);
+ }
if (free_etag) {
efree(etag);
}
- efree(header);
+ STR_FREE(header);
return ret ? PHP_HTTP_CACHE_HIT : PHP_HTTP_CACHE_MISS;
}
time_t ums, lm = 0;
zval *zbody = NULL, *zlm;
- if ( !(header = php_http_env_get_request_header(header_str, header_len TSRMLS_CC))
+ if ( !(header = php_http_env_get_request_header(header_str, header_len, NULL TSRMLS_CC))
|| !(zbody = get_option(options, ZEND_STRL("body") TSRMLS_CC))
|| !(Z_TYPE_P(zbody) == IS_OBJECT)
|| !instanceof_function(Z_OBJCE_P(zbody), php_http_message_body_class_entry TSRMLS_CC)
ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Content-Disposition: %s", tmp);
} else {
int new_f_len;
- char *new_f_str = php_addslashes(estrndup(Z_STRVAL_P(zfilename_copy), Z_STRLEN_P(zfilename_copy)), Z_STRLEN_P(zfilename_copy), &new_f_len, 0 TSRMLS_CC);
+ char *new_f_str = php_addslashes(estrndup(Z_STRVAL_P(zfilename_copy), Z_STRLEN_P(zfilename_copy)), Z_STRLEN_P(zfilename_copy), &new_f_len, 1 TSRMLS_CC);
ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Content-Disposition: %s; filename=\"%.*s\"", tmp, new_f_len, new_f_str);
STR_FREE(new_f_str);
return ret;
}
- switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match") TSRMLS_CC)) {
- case PHP_HTTP_CACHE_MISS:
- break;
-
- case PHP_HTTP_CACHE_NO:
- if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since") TSRMLS_CC)) {
+ if (php_http_env_get_response_code(TSRMLS_C) < 400 && !php_http_env_got_request_header(ZEND_STRL("Authorization") TSRMLS_CC)
+ && ( !SG(request_info).request_method
+ || !strcasecmp(SG(request_info).request_method, "GET")
+ || !strcasecmp(SG(request_info).request_method, "HEAD")
+ )
+ ) {
+ switch (php_http_env_is_response_cached_by_etag(options, ZEND_STRL("If-None-Match") TSRMLS_CC)) {
+ case PHP_HTTP_CACHE_MISS:
break;
- }
- /* fallthrough */
- case PHP_HTTP_CACHE_HIT:
- ret = php_http_env_set_response_code(304 TSRMLS_CC);
- r->done = 1;
- break;
- }
+ case PHP_HTTP_CACHE_NO:
+ if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since") TSRMLS_CC)) {
+ break;
+ }
+ /* no break */
- if ((zoption = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
- ret = php_http_env_set_response_header_value(0, ZEND_STRL("ETag"), zoption, 1 TSRMLS_CC);
- zval_ptr_dtor(&zoption);
- }
- if ((zoption = get_option(options, ZEND_STRL("lastModified") TSRMLS_CC))) {
- zval *zoption_copy = php_http_ztyp(IS_LONG, zoption);
+ case PHP_HTTP_CACHE_HIT:
+ ret = php_http_env_set_response_code(304 TSRMLS_CC);
+ r->done = 1;
+ break;
+ }
- zval_ptr_dtor(&zoption);
- if (Z_LVAL_P(zoption_copy)) {
- char *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), Z_LVAL_P(zoption_copy), 0 TSRMLS_CC);
- if (date) {
- ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Last-Modified: %s", date);
- efree(date);
+ if ((zoption = get_option(options, ZEND_STRL("etag") TSRMLS_CC))) {
+ zval *zoption_copy = php_http_ztyp(IS_STRING, zoption);
+
+ zval_ptr_dtor(&zoption);
+ if (*Z_STRVAL_P(zoption_copy) != '"' && strncmp(Z_STRVAL_P(zoption_copy), "W/\"", 3)) {
+ ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "ETag: \"%s\"", Z_STRVAL_P(zoption_copy));
+ } else {
+ ret = php_http_env_set_response_header_value(0, ZEND_STRL("ETag"), zoption_copy, 1 TSRMLS_CC);
}
+ zval_ptr_dtor(&zoption_copy);
+ }
+ if ((zoption = get_option(options, ZEND_STRL("lastModified") TSRMLS_CC))) {
+ zval *zoption_copy = php_http_ztyp(IS_LONG, zoption);
+
+ zval_ptr_dtor(&zoption);
+ if (Z_LVAL_P(zoption_copy)) {
+ char *date = php_format_date(ZEND_STRL(PHP_HTTP_DATE_FORMAT), Z_LVAL_P(zoption_copy), 0 TSRMLS_CC);
+ if (date) {
+ ret = php_http_env_set_response_header_format(0, 1 TSRMLS_CC, "Last-Modified: %s", date);
+ efree(date);
+ }
+ }
+ zval_ptr_dtor(&zoption_copy);
}
- zval_ptr_dtor(&zoption_copy);
}
}
projects / m6w6 / ext-http / blobdiff