| 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)
{
val = zend_read_property(Z_OBJCE_P(options), options, name, name_len, 0 TSRMLS_CC);
efree(name);
} else {
- if (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), name_str, name_len + 1, (void *) &valptr)) {
+ if (SUCCESS == zend_symtable_find(Z_ARRVAL_P(options), name_str, name_len + 1, (void *) &valptr)) {
val = *valptr;
} else {
val = NULL;
char *header, *etag;
zval *zetag, *zbody = NULL;
- 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)
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)
switch (Z_LVAL_P(zdisposition_copy)) {
case PHP_HTTP_CONTENT_DISPOSITION_NONE:
ret = php_http_env_set_response_header_value(0, ZEND_STRL("Content-Disposition"), NULL, 1 TSRMLS_CC);
+ break;
case PHP_HTTP_CONTENT_DISPOSITION_INLINE:
tmp = "inline";
break;
if (PHP_HTTP_CACHE_HIT != php_http_env_is_response_cached_by_last_modified(options, ZEND_STRL("If-Modified-Since") TSRMLS_CC)) {
break;
}
+ /* fallthrough */
case PHP_HTTP_CACHE_HIT:
ret = php_http_env_set_response_code(304 TSRMLS_CC);
}
break;
}
+
+ break;
}
}
} else if (zbody) {