projects
/
m6w6
/
ext-http
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
7787d4f
)
* separate http_check_allowed_methods()
author
Michael Wallner
<mike@php.net>
Fri, 11 Feb 2005 17:53:23 +0000
(17:53 +0000)
committer
Michael Wallner
<mike@php.net>
Fri, 11 Feb 2005 17:53:23 +0000
(17:53 +0000)
http.c
patch
|
blob
|
history
diff --git
a/http.c
b/http.c
index 0cf01ae3ea9f7291397710398859be8549216232..5aac8211837c9e01dd24b68e5cb3e81fffac4cbb 100644
(file)
--- a/
http.c
+++ b/
http.c
@@
-1069,16
+1069,27
@@
static void php_http_init_globals(zend_http_globals *http_globals)
}
/* }}} */
}
/* }}} */
-/* {{{ 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 STATUS _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);
http_send_header(allow_header);
efree(allow_header);
http_send_status(405);
- return SUCCESS;
+ return FAILURE;
+ }
+ return SUCCESS;
+}
+/* }}} */
+
+/* {{{ PHP_INI */
+PHP_INI_MH(update_allowed_methods)
+{
+ if (SUCCESS != http_check_allowed_methods(new_value, new_value_length)) {
+ return FAILURE;
}
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
}
}
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
}
@@
-1114,15
+1125,7
@@
PHP_MSHUTDOWN_FUNCTION(http)
PHP_RINIT_FUNCTION(http)
{
char *allowed_methods = INI_STR("http.allowed_methods");
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);
- }
- return SUCCESS;
+ return http_check_allowed_methods(allowed_methods, strlen(allowed_methods));
}
/* }}} */
}
/* }}} */