/* $Id$ */
+#define _WINSOCKAPI_
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#ifdef HAVE_CONFIG_H
php_end_ob_buffers(0 TSRMLS_CC);
http_send_header("Cache-Control: private, must-revalidate, max-age=0");
+ if (etag_len) {
+ RETURN_SUCCESS(http_send_etag(etag, etag_len));
+ }
+
/* if no etag is given and we didn't already
* start ob_etaghandler -- start it
*/
- if (!HTTP_G(etag_started) && !etag_len) {
+ if (!HTTP_G(etag_started)) {
php_ob_set_internal_handler(_http_ob_etaghandler, (uint) 4096, "etag output handler", 0 TSRMLS_CC);
HTTP_G(etag_started) = 1;
RETURN_BOOL(php_start_ob_buffer_named("etag output handler", (uint) 4096, 0 TSRMLS_CC));
}
}
- RETURN_SUCCESS(http_send_etag(etag, etag_len));
}
/* }}} */
}
/* }}} */
-/* {{{ PHP_INI */
-PHP_INI_MH(update_allowed_methods)
+/* {{{ static inline STATUS http_check_allowed_methods(char *, int) */
+#define http_check_allowed_methods(m, l) _http_check_allowed_methods((m), (l) TSRMLS_CC)
+static inline void _http_check_allowed_methods(char *methods, int length TSRMLS_DC)
{
- if (SG(request_info).request_method && new_value_length && (!strstr(new_value, SG(request_info).request_method))) {
- char *allow_header = emalloc(new_value_length + sizeof("Allow: "));
- sprintf(allow_header, "Allow: %s", new_value);
+ if (length && SG(request_info).request_method && (!strstr(methods, SG(request_info).request_method))) {
+ char *allow_header = emalloc(length + sizeof("Allow: "));
+ sprintf(allow_header, "Allow: %s", methods);
http_send_header(allow_header);
efree(allow_header);
http_send_status(405);
- return SUCCESS;
+ zend_bailout();
}
+}
+/* }}} */
+
+/* {{{ PHP_INI */
+PHP_INI_MH(update_allowed_methods)
+{
+ http_check_allowed_methods(new_value, new_value_length);
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
}
PHP_INI_BEGIN()
- STD_PHP_INI_ENTRY("http.allowed_methods", "HEAD,GET,POST", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
+ STD_PHP_INI_ENTRY("http.allowed_methods", "OPTIONS,GET,HEAD,POST,PUT,DELETE,TRACE,CONNECT", PHP_INI_ALL, update_allowed_methods, allowed_methods, zend_http_globals, http_globals)
PHP_INI_END()
/* }}} */
PHP_RINIT_FUNCTION(http)
{
char *allowed_methods = INI_STR("http.allowed_methods");
- int am_len;
- if (SG(request_info).request_method && (am_len = strlen(allowed_methods)) && (!strstr(allowed_methods, SG(request_info).request_method))) {
- char *allow_header = emalloc(am_len + sizeof("Allow: "));
- sprintf(allow_header, "Allow: %s", allowed_methods);
- http_send_header(allow_header);
- efree(allow_header);
- http_send_status(405);
- }
+ http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
return SUCCESS;
}
/* }}} */
/* {{{ PHP_RSHUTDOWN_FUNCTION */
PHP_RSHUTDOWN_FUNCTION(http)
{
- if (HTTP_G(ctype)) {
- efree(HTTP_G(ctype));
- HTTP_G(ctype) = NULL;
- }
+ HTTP_G(etag_started) = 0;
+ HTTP_G(lmod) = 0;
+
if (HTTP_G(etag)) {
efree(HTTP_G(etag));
HTTP_G(etag) = NULL;
}
+
+ if (HTTP_G(ctype)) {
+ efree(HTTP_G(ctype));
+ HTTP_G(ctype) = NULL;
+ }
#ifdef HTTP_HAVE_CURL
if (HTTP_G(curlbuf).body.data) {
efree(HTTP_G(curlbuf).body.data);