| 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")
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, 0, meth);
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)) {
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();
}
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);
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;
}
{
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);