separate http_env_request; add getQuer(), getPost(), getFiles()

[m6w6/ext-http] / php_http_request_method.c

diff --git a/php_http_request_method.c b/php_http_request_method.c
index 3ca0b5548cc9813383b87d9bb6ebe36f38eb122d..118721f550ce5e55858f07aefa4817c4c5a157e0 100644 (file)
--- a/php_http_request_method.c
+++ b/php_http_request_method.c
@@ -6,15 +6,11 @@
     | 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: http_request_method_api.c 292841 2009-12-31 08:48:57Z mike $ */
-
-#include "php_http.h"
-
-#include <Zend/zend_interfaces.h>
+#include "php_http_api.h"
 
 static PHP_HTTP_STRLIST(php_http_request_methods) =
        PHP_HTTP_STRLIST_ITEM("UNKNOWN")
@@ -36,7 +32,7 @@ static PHP_HTTP_STRLIST(php_http_request_methods) =
        PHP_HTTP_STRLIST_ITEM("LOCK")
        PHP_HTTP_STRLIST_ITEM("UNLOCK")
        /* WebDAV Versioning - RFC 3253 */
-       PHP_HTTP_STRLIST_ITEM("VERSION-CONTROL")
+       PHP_HTTP_STRLIST_ITEM("VERSION_CONTROL")
        PHP_HTTP_STRLIST_ITEM("REPORT")
        PHP_HTTP_STRLIST_ITEM("CHECKOUT")
        PHP_HTTP_STRLIST_ITEM("CHECKIN")
@@ -45,7 +41,7 @@ static PHP_HTTP_STRLIST(php_http_request_methods) =
        PHP_HTTP_STRLIST_ITEM("UPDATE")
        PHP_HTTP_STRLIST_ITEM("LABEL")
        PHP_HTTP_STRLIST_ITEM("MERGE")
-       PHP_HTTP_STRLIST_ITEM("BASELINE-CONTROL")
+       PHP_HTTP_STRLIST_ITEM("BASELINE_CONTROL")
        PHP_HTTP_STRLIST_ITEM("MKACTIVITY")
        /* WebDAV Access Control - RFC 3744 */
        PHP_HTTP_STRLIST_ITEM("ACL")
@@ -204,7 +200,7 @@ PHP_MINIT_FUNCTION(http_request_method)
 {
        php_http_strlist_iterator_t std;
 
-       PHP_HTTP_REGISTER_CLASS(http\\request, Method, http_request_method, php_http_object_class_entry, 0);
+       PHP_HTTP_REGISTER_CLASS(http\\Request, Method, http_request_method, php_http_object_class_entry, 0);
 
        zend_declare_property_null(php_http_request_method_class_entry, ZEND_STRL("name"), ZEND_ACC_PROTECTED TSRMLS_CC);