| modification, are permitted provided that the conditions mentioned |
| in the accompanying LICENSE file are met. |
+--------------------------------------------------------------------+
- | Copyright (c) 2004-2006, Michael Wallner <mike@php.net> |
+ | Copyright (c) 2004-2010, Michael Wallner <mike@php.net> |
+--------------------------------------------------------------------+
*/
#include "php_output.h"
#include "ext/standard/url.h"
+#include "ext/standard/php_lcg.h"
#include "php_http_api.h"
#include "php_http_send_api.h"
HTTP_LONG_CONSTANT("HTTP_SUPPORT_MAGICMIME", HTTP_SUPPORT_MAGICMIME);
HTTP_LONG_CONSTANT("HTTP_SUPPORT_ENCODINGS", HTTP_SUPPORT_ENCODINGS);
HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS);
+ HTTP_LONG_CONSTANT("HTTP_SUPPORT_EVENTS", HTTP_SUPPORT_EVENTS);
HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_COMMA", HTTP_PARAMS_ALLOW_COMMA);
HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_FAILURE", HTTP_PARAMS_ALLOW_FAILURE);
# ifdef HTTP_HAVE_SSL
support |= HTTP_SUPPORT_SSLREQUESTS;
# endif
+# ifdef HTTP_HAVE_EVENT
+ support |= HTTP_SUPPORT_EVENTS;
+# endif
#endif
#ifdef HTTP_HAVE_MAGIC
support |= HTTP_SUPPORT_MAGICMIME;
}
/* }}} */
+/* {{{ http_boundary(char *, size_t) */
+size_t _http_boundary(char *buf, size_t buf_len TSRMLS_DC)
+{
+ return snprintf(buf, buf_len, "%lu%0.9f", (ulong) HTTP_G->request.time, (float) php_combined_lcg(TSRMLS_C));
+}
+/* }}} */
+
/* {{{ void http_error(long, long, char*) */
void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
{
va_start(args, format);
#ifdef ZEND_ENGINE_2
- if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
+ if ((type == E_THROW) || (GLOBAL_ERROR_HANDLING == EH_THROW)) {
char *message;
zend_class_entry *ce = http_exception_get_for_code(code);
vspprintf(&message, 0, format, args);
zend_throw_exception(ce, message, code TSRMLS_CC);
efree(message);
- } http_catch(PG(exception_class) ? PG(exception_class) : HTTP_EX_DEF_CE);
+ } http_catch(GLOBAL_EXCEPTION_CLASS ? GLOBAL_EXCEPTION_CLASS : HTTP_EX_DEF_CE);
} else
#endif
php_verror(NULL, "", type, format, args TSRMLS_CC);
copy_bt_args(old_exception, new_exception TSRMLS_CC);
copy_bt_args(old_exception, sub_exception TSRMLS_CC);
}
-
+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3
+ Z_ADDREF_P(old_exception);
+ zend_exception_set_previous(new_exception, old_exception TSRMLS_CC);
+#endif
zval_ptr_dtor(&old_exception);
return new_exception;
}
/* }}} */
+
+/* {{{ STATUS http_object_new(zend_object_value *, const char *, uint, http_object_new_t, zend_class_entry *, void *, void **) */
+STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uint cname_len, http_object_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC)
+{
+ zend_class_entry *ce = parent_ce;
+
+ if (cname_str && cname_len) {
+ if (!(ce = zend_fetch_class(HTTP_ZAPI_CONST_CAST(char *) cname_str, cname_len, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC))) {
+ return FAILURE;
+ }
+ if (!instanceof_function(ce, parent_ce TSRMLS_CC)) {
+ http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Class %s does not extend %s", cname_str, parent_ce->name);
+ return FAILURE;
+ }
+ }
+
+ *ov = create(ce, intern_ptr, obj_ptr TSRMLS_CC);
+ return SUCCESS;
+}
+/* }}} */
#endif /* ZEND_ENGINE_2 */
/* {{{ void http_log(char *, char *, char *) */
return FAILURE;
}
+#if PHP_VERSION_ID < 50399
if (!OG(ob_lock)) {
php_end_ob_buffers(0 TSRMLS_CC);
}
+#else
+ if (php_output_get_status(TSRMLS_C) & PHP_OUTPUT_LOCKED) {
+ php_output_end_all(TSRMLS_C);
+ }
+#endif
if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) {
PHPWRITE(body, strlen(body));
}
/* }}} */
/* {{{ zval *http_get_server_var_ex(char *, size_t) */
-PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC)
+PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_len, zend_bool check TSRMLS_DC)
{
- zval **hsv;
- zval **var;
+ zval **hsv, **var;
+ char *env;
+
+ /* if available, this is a lot faster than accessing $_SERVER */
+ if (sapi_module.getenv) {
+ if ((!(env = sapi_module.getenv((char *) key, key_len TSRMLS_CC))) || (check && !*env)) {
+ return NULL;
+ }
+ if (HTTP_G->server_var) {
+ zval_ptr_dtor(&HTTP_G->server_var);
+ }
+ MAKE_STD_ZVAL(HTTP_G->server_var);
+ ZVAL_STRING(HTTP_G->server_var, env, 1);
+ return HTTP_G->server_var;
+ }
+
#ifdef ZEND_ENGINE_2
zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC);
#endif
+
if ((SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) {
return NULL;
}
- if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), (char *) key, key_size, (void *) &var))) {
+ if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), HTTP_ZAPI_CONST_CAST(char *) key, key_len + 1, (void *) &var))) {
return NULL;
}
if (check && !((Z_TYPE_PP(var) == IS_STRING) && Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {
}
return SUCCESS;
} else if (sapi_module.read_post && !HTTP_G->read_post_data) {
- char buf[4096];
+ char *buf = emalloc(4096);
int len;
HTTP_G->read_post_data = 1;
- while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+ while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
*body = erealloc(*body, *length + len + 1);
memcpy(*body + *length, buf, len);
*length += len;
(*body)[*length] = '\0';
+ if (len < (int) sizeof(buf)) {
+ break;
+ }
}
+ efree(buf);
/* check for error */
if (len < 0) {
HTTP_G->read_post_data = 1;
if ((s = php_stream_temp_new())) {
- char buf[4096];
+ char *buf = emalloc(4096);
int len;
- while (0 < (len = sapi_module.read_post(buf, sizeof(buf) TSRMLS_CC))) {
+ while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) {
php_stream_write(s, buf, len);
+ if (len < (int) sizeof(buf)) {
+ break;
+ }
}
+ efree(buf);
if (len < 0) {
php_stream_close(s);
if (vallen) {
MAKE_STD_ZVAL(entry);
array_init(entry);
- kdup = estrndup(key, keylen);
- add_assoc_stringl_ex(entry, kdup, keylen + 1, (char *) val, vallen, 1);
- efree(kdup);
+ if (keylen) {
+ kdup = estrndup(key, keylen);
+ add_assoc_stringl_ex(entry, kdup, keylen + 1, (char *) val, vallen, 1);
+ efree(kdup);
+ } else {
+ add_next_index_stringl(entry, (char *) val, vallen, 1);
+ }
add_next_index_zval(&tmp, entry);
} else {
add_next_index_stringl(&tmp, (char *) key, keylen, 1);
char *s, *c, *key = NULL, *val = NULL;
for(c = s = estrdup(param);;) {
+ continued:
#if 0
+ {
char *tk = NULL, *tv = NULL;
if (key) {
), *c?*c:'0', tk, tv
);
STR_FREE(tk); STR_FREE(tv);
+ }
#endif
- continued:
switch (st) {
case ST_QUOTE:
quote:
goto failure;
break;
- case '=':
- if (key) {
- keylen = c - key;
- st = ST_VALUE;
- } else {
- goto failure;
- }
- break;
-
case ' ':
if (key) {
keylen = c - key;
}
break;
+ case ':':
+ if (!(flags & HTTP_PARAMS_COLON_SEPARATOR)) {
+ goto not_separator;
+ }
+ if (key) {
+ keylen = c - key;
+ st = ST_VALUE;
+ } else {
+ goto failure;
+ }
+ break;
+
+ case '=':
+ if (flags & HTTP_PARAMS_COLON_SEPARATOR) {
+ goto not_separator;
+ }
+ if (key) {
+ keylen = c - key;
+ st = ST_VALUE;
+ } else {
+ goto failure;
+ }
+ break;
+
default:
+ not_separator:
if (!key) {
key = c;
}
http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Unexpected character (%c) at pos %tu of %zu", *c, c-s, strlen(s));
}
if (flags & HTTP_PARAMS_ALLOW_FAILURE) {
- --c;
+ if (st == ST_KEY) {
+ if (key) {
+ keylen = c - key;
+ } else {
+ key = c;
+ }
+ } else {
+ --c;
+ }
st = ST_ADD;
goto continued;
}
/* }}} */
/* {{{ array_join */
-int apply_array_append_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_append_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
{
int flags;
char *key = NULL;
ZVAL_ADDREF(*value);
if (data) {
- if (Z_TYPE_PP(data) != IS_ARRAY) {
- convert_to_array(*data);
- }
- add_next_index_zval(*data, *value);
+ add_next_index_zval(http_zset(IS_ARRAY, *data), *value);
} else if (key) {
zend_hash_add(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL);
} else {
return ZEND_HASH_APPLY_KEEP;
}
-int apply_array_merge_func(void *pDest, int num_args, va_list args, zend_hash_key *hash_key)
+int apply_array_merge_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key)
{
int flags;
char *key = NULL;
projects / m6w6 / ext-http / blobdiff