X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_method.c;h=b4b3567e144844e0a1a83a211b9014483771a38e;hp=b482d03ec89ffa0f966c2ae2f2b72f67988aa4f0;hb=8d05291f42b3b42159b3fe91492aa4862f3d4405;hpb=c5c580f24e24e8032a0554a2e39e38c496144bc2

diff --git a/php_http_request_method.c b/php_http_request_method.c
index b482d03..b4b3567 100644
--- a/php_http_request_method.c
+++ b/php_http_request_method.c
@@ -6,12 +6,10 @@
     | 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>
@@ -52,10 +50,10 @@ static PHP_HTTP_STRLIST(php_http_request_methods) =
 	PHP_HTTP_STRLIST_STOP
 ;
 
-PHP_HTTP_API const char *php_http_request_method_name(php_http_request_method_t meth)
+PHP_HTTP_API const char *php_http_request_method_name(php_http_request_method_t meth TSRMLS_DC)
 {
 	if (meth > PHP_HTTP_NO_REQUEST_METHOD && meth < PHP_HTTP_MAX_REQUEST_METHOD) {
-		return php_http_strlist_find(php_http_request_methods, 1, meth);
+		return php_http_strlist_find(php_http_request_methods, 0, meth);
 	} else {
 		zval **val, *cmp, res;
 		HashPosition pos;
@@ -127,12 +125,12 @@ zend_function_entry php_http_request_method_method_entry[] = {
 
 PHP_METHOD(HttpRequestMethod, __construct)
 {
-	with_error_handling(EH_THROW, PHP_HTTP_EX_CE(runtime)) {
+	with_error_handling(EH_THROW, php_http_exception_class_entry) {
 		char *meth_str;
 		int meth_len;
 
 		if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &meth_str, &meth_len)) {
-			with_error_handling(EH_THROW, PHP_HTTP_EX_CE(request_method)) {
+			with_error_handling(EH_THROW, php_http_exception_class_entry) {
 				zval *zarg, *zret;
 
 				if (SUCCESS == zend_get_parameters(ZEND_NUM_ARGS(), 1, &zarg)) {
@@ -153,9 +151,9 @@ PHP_METHOD(HttpRequestMethod, __construct)
 PHP_METHOD(HttpRequestMethod, __toString)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
-		zval *retval = php_http_zsep(IS_STRING, zend_read_property(php_http_request_method_class_entry, getThis(), ZEND_STRL("name"), 0 TSRMLS_CC));
+		zval *retval = php_http_ztyp(IS_STRING, zend_read_property(php_http_request_method_class_entry, getThis(), ZEND_STRL("name"), 0 TSRMLS_CC));
 
-		RETURN_ZVAL(retval, 0, 0);
+		RETURN_ZVAL(retval, 1, 1);
 	}
 	RETURN_EMPTY_STRING();
 }
@@ -163,7 +161,7 @@ PHP_METHOD(HttpRequestMethod, __toString)
 PHP_METHOD(HttpRequestMethod, getId)
 {
 	if (SUCCESS == zend_parse_parameters_none()) {
-		zval **data, *meth = php_http_zsep(IS_STRING, zend_read_property(php_http_request_method_class_entry, getThis(), ZEND_STRL("name"), 0 TSRMLS_CC));
+		zval **data, *meth = php_http_ztyp(IS_STRING, zend_read_property(php_http_request_method_class_entry, getThis(), ZEND_STRL("name"), 0 TSRMLS_CC));
 
 		if (SUCCESS == zend_hash_find(&php_http_request_method_class_entry->constants_table, Z_STRVAL_P(meth), Z_STRLEN_P(meth) + 1, (void *) &data)) {
 			zval_ptr_dtor(&meth);
@@ -195,7 +193,7 @@ PHP_METHOD(HttpRequestMethod, register)
 	int meth_len;
 
 	if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &meth_str, &meth_len)) {
-		RETURN_SUCCESS(zend_declare_class_constant_long(php_http_request_method_class_entry, meth_str, meth_len, zend_hash_num_elements(&php_http_request_class_entry->constants_table) TSRMLS_CC));
+		RETURN_SUCCESS(zend_declare_class_constant_long(php_http_request_method_class_entry, meth_str, meth_len, zend_hash_num_elements(&php_http_request_method_class_entry->constants_table) TSRMLS_CC));
 	}
 	RETURN_FALSE;
 }
@@ -204,7 +202,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);