/*
- +----------------------------------------------------------------------+
- | PECL :: http |
- +----------------------------------------------------------------------+
- | This source file is subject to version 3.0 of the PHP license, that |
- | is bundled with this package in the file LICENSE, and is available |
- | through the world-wide-web at http://www.php.net/license/3_0.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
- +----------------------------------------------------------------------+
- | Copyright (c) 2004-2005 Michael Wallner <mike@php.net> |
- +----------------------------------------------------------------------+
+ +--------------------------------------------------------------------+
+ | PECL :: http |
+ +--------------------------------------------------------------------+
+ | Redistribution and use in source and binary forms, with or without |
+ | modification, are permitted provided that the conditions mentioned |
+ | in the accompanying LICENSE file are met. |
+ +--------------------------------------------------------------------+
+ | Copyright (c) 2004-2005, Michael Wallner <mike@php.net> |
+ +--------------------------------------------------------------------+
*/
/* $Id$ */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "php.h"
+#define HTTP_WANT_CURL
#include "php_http.h"
-#include "php_http_std_defs.h"
+
#include "php_http_api.h"
+#include "php_http_request_api.h"
#include "php_http_request_method_api.h"
-#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY)
# include "php_http_request_object.h"
#endif
-#include "missing.h"
-#include "phpstr/phpstr.h"
-
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
/* {{{ char *http_request_methods[] */
static const char *const http_request_methods[] = {
- "UNKOWN",
+ "UNKNOWN",
/* HTTP/1.1 */
"GET",
"HEAD",
};
/* }}} */
-STATUS _http_request_method_global_init(INIT_FUNC_ARGS)
+/* {{{ */
+PHP_MINIT_FUNCTION(http_request_method)
{
/* HTTP/1.1 */
HTTP_LONG_CONSTANT("HTTP_METH_GET", HTTP_GET);
return SUCCESS;
}
+PHP_RINIT_FUNCTION(http_request_method)
+{
+ HTTP_G(request).methods.custom.entries = ecalloc(1, sizeof(http_request_method_entry *));
+
+ return SUCCESS;
+}
+
+PHP_RSHUTDOWN_FUNCTION(http_request_method)
+{
+ int i;
+ getGlobals(G);
+ http_request_method_entry **ptr = G->request.methods.custom.entries;
+
+ for (i = 0; i < G->request.methods.custom.count; ++i) {
+ if (ptr[i]) {
+ http_request_method_unregister(HTTP_CUSTOM_REQUEST_METHOD_START + i);
+ }
+ }
+ efree(G->request.methods.custom.entries);
+
+ return SUCCESS;
+}
+/* }}} */
+
/* {{{ char *http_request_method_name(http_request_method) */
PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC)
{
- zval **meth;
+ getGlobals(G);
+ http_request_method_entry **ptr = G->request.methods.custom.entries;
if (HTTP_STD_REQUEST_METHOD(m)) {
return http_request_methods[m];
}
- if (SUCCESS == zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(m), (void **) &meth)) {
- return Z_STRVAL_PP(meth);
+ if ( (HTTP_CUSTOM_REQUEST_METHOD(m) >= 0) &&
+ (HTTP_CUSTOM_REQUEST_METHOD(m) < G->request.methods.custom.count) &&
+ (ptr[HTTP_CUSTOM_REQUEST_METHOD(m)])) {
+ return ptr[HTTP_CUSTOM_REQUEST_METHOD(m)]->name;
}
return http_request_methods[0];
}
/* }}} */
-/* {{{ unsigned long http_request_method_exists(zend_bool, unsigned long, char *) */
-PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC)
+/* {{{ int http_request_method_exists(zend_bool, ulong, char *) */
+PHP_HTTP_API int _http_request_method_exists(zend_bool by_name, http_request_method id, const char *name TSRMLS_DC)
{
+ int i;
+ getGlobals(G);
+ http_request_method_entry **ptr = G->request.methods.custom.entries;
+
if (by_name) {
- unsigned i;
-
- for (i = HTTP_NO_REQUEST_METHOD + 1; i < HTTP_MAX_REQUEST_METHOD; ++i) {
- if (!strcmp(name, http_request_methods[i])) {
+ for (i = HTTP_MIN_REQUEST_METHOD; i < HTTP_MAX_REQUEST_METHOD; ++i) {
+ if (!strcasecmp(name, http_request_methods[i])) {
return i;
}
}
- {
- zval **data;
- char *key;
- ulong idx;
-
- FOREACH_HASH_KEYVAL(&HTTP_G(request).methods.custom, key, idx, data) {
- if (!strcmp(name, Z_STRVAL_PP(data))) {
- return idx + HTTP_MAX_REQUEST_METHOD;
- }
+ for (i = 0; i < G->request.methods.custom.count; ++i) {
+ if (ptr[i] && !strcasecmp(name, ptr[i]->name)) {
+ return HTTP_CUSTOM_REQUEST_METHOD_START + i;
}
}
- return 0;
- } else {
- return HTTP_STD_REQUEST_METHOD(id) || zend_hash_index_exists(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(id)) ? id : 0;
+ } else if (HTTP_STD_REQUEST_METHOD(id)) {
+ return id;
+ } else if ( (HTTP_CUSTOM_REQUEST_METHOD(id) >= 0) &&
+ (HTTP_CUSTOM_REQUEST_METHOD(id) < G->request.methods.custom.count) &&
+ (ptr[HTTP_CUSTOM_REQUEST_METHOD(id)])) {
+ return id;
}
+
+ return 0;
}
/* }}} */
-/* {{{ unsigned long http_request_method_register(char *) */
-PHP_HTTP_API unsigned long _http_request_method_register(const char *method_name TSRMLS_DC)
+/* {{{ int http_request_method_register(char *) */
+PHP_HTTP_API int _http_request_method_register(const char *method_name, int method_name_len TSRMLS_DC)
{
- zval array;
- char *http_method, *method;
- int i, method_len = strlen(method_name);
- unsigned long meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD;
-
- method = emalloc(method_len + 1);
- for (i = 0; i < method_len; ++i) {
- method[i] = toupper(method_name[i]);
+ int i, meth_num;
+ char *http_method, *method, *mconst;
+ getGlobals(G);
+ http_request_method_entry **ptr = G->request.methods.custom.entries;
+
+ if (!isalpha(*method_name)) {
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Request method does not start with a character (%s)", method_name);
+ return 0;
+ }
+
+ if (http_request_method_exists(1, 0, method_name)) {
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Request method does already exist (%s)", method_name);
+ return 0;
+ }
+
+ method = emalloc(method_name_len + 1);
+ mconst = emalloc(method_name_len + 1);
+ for (i = 0; i < method_name_len; ++i) {
+ switch (method_name[i])
+ {
+ case '-':
+ method[i] = '-';
+ mconst[i] = '_';
+ break;
+
+ default:
+ if (!isalnum(method_name[i])) {
+ efree(method);
+ efree(mconst);
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Request method contains illegal characters (%s)", method_name);
+ return 0;
+ }
+ mconst[i] = method[i] = toupper(method_name[i]);
+ break;
+ }
}
- method[method_len] = '\0';
+ method[method_name_len] = '\0';
+ mconst[method_name_len] = '\0';
- INIT_ZARR(array, &HTTP_G(request).methods.custom);
- add_next_index_stringl(&array, method, method_len, 0);
+ ptr = erealloc(ptr, sizeof(http_request_method_entry *) * (G->request.methods.custom.count + 1));
+ G->request.methods.custom.entries = ptr;
+ ptr[G->request.methods.custom.count] = emalloc(sizeof(http_request_method_entry));
+ ptr[G->request.methods.custom.count]->name = method;
+ ptr[G->request.methods.custom.count]->cnst = mconst;
+ meth_num = HTTP_CUSTOM_REQUEST_METHOD_START + G->request.methods.custom.count++;
- method_len = spprintf(&http_method, 0, "HTTP_METH_%s", method);
- zend_register_long_constant(http_method, method_len + 1, meth_num, CONST_CS, http_module_number TSRMLS_CC);
+ method_name_len = spprintf(&http_method, 0, "HTTP_METH_%s", mconst);
+ zend_register_long_constant(http_method, method_name_len + 1, meth_num, CONST_CS, http_module_number TSRMLS_CC);
efree(http_method);
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY)
- method_len = spprintf(&http_method, 0, "METH_%s", method);
- zend_declare_class_constant_long(http_request_object_ce, http_method, method_len, meth_num TSRMLS_CC);
+ method_name_len = spprintf(&http_method, 0, "METH_%s", mconst);
+ zend_declare_class_constant_long(http_request_object_ce, http_method, method_name_len, meth_num TSRMLS_CC);
efree(http_method);
#endif
-
+
return meth_num;
}
/* }}} */
-/* {{{ STATUS http_request_method_unregister(usngigned long) */
-PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC)
+/* {{{ STATUS http_request_method_unregister(int) */
+PHP_HTTP_API STATUS _http_request_method_unregister(int method TSRMLS_DC)
{
- zval **zmethod;
char *http_method;
int method_len;
-
- if (SUCCESS != zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method), (void **) &zmethod)) {
- http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Request method with id %lu does not exist", method);
+ getGlobals(G);
+ http_request_method_entry **ptr = G->request.methods.custom.entries;
+
+ if (HTTP_STD_REQUEST_METHOD(method)) {
+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Standard request methods cannot be unregistered");
return FAILURE;
}
+ if ( (HTTP_CUSTOM_REQUEST_METHOD(method) < 0) ||
+ (HTTP_CUSTOM_REQUEST_METHOD(method) > G->request.methods.custom.count) ||
+ (!ptr[HTTP_CUSTOM_REQUEST_METHOD(method)])) {
+ http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Custom request method with id %lu does not exist", method);
+ return FAILURE;
+ }
+
#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY)
- method_len = spprintf(&http_method, 0, "METH_%s", Z_STRVAL_PP(zmethod));
- if ((SUCCESS != zend_hash_del(&http_request_object_ce->constants_table, http_method, method_len + 1))) {
+ method_len = spprintf(&http_method, 0, "METH_%s", ptr[HTTP_CUSTOM_REQUEST_METHOD(method)]->cnst);
+ if (SUCCESS != zend_hash_del(&http_request_object_ce->constants_table, http_method, method_len + 1)) {
http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Could not unregister request method: HttpRequest::%s", http_method);
efree(http_method);
return FAILURE;
efree(http_method);
#endif
- method_len = spprintf(&http_method, 0, "HTTP_METH_%s", Z_STRVAL_PP(zmethod));
- if ( (SUCCESS != zend_hash_index_del(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method)))
- || (SUCCESS != zend_hash_del(EG(zend_constants), http_method, method_len + 1))) {
+ method_len = spprintf(&http_method, 0, "HTTP_METH_%s", ptr[HTTP_CUSTOM_REQUEST_METHOD(method)]->cnst);
+ if (SUCCESS != zend_hash_del(EG(zend_constants), http_method, method_len + 1)) {
http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Could not unregister request method: %s", http_method);
efree(http_method);
return FAILURE;
}
efree(http_method);
+ efree(ptr[HTTP_CUSTOM_REQUEST_METHOD(method)]->name);
+ efree(ptr[HTTP_CUSTOM_REQUEST_METHOD(method)]->cnst);
+ STR_SET(ptr[HTTP_CUSTOM_REQUEST_METHOD(method)], NULL);
+
return SUCCESS;
}
/* }}} */
projects / m6w6 / ext-http / blobdiff