projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
reinitilaize http message prior throwing error
[m6w6/ext-http]
/
http_api.c
diff --git
a/http_api.c
b/http_api.c
index 138b08e0697377e05afd17470cba39b2abc5a84d..77b11348c0a0bfc484d3120de9dcb2b1a08ab12b 100644
(file)
--- a/
http_api.c
+++ b/
http_api.c
@@
-17,6
+17,7
@@
#include "php_output.h"
#include "ext/standard/url.h"
#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"
#include "php_http_api.h"
#include "php_http_send_api.h"
@@
-32,6
+33,7
@@
PHP_MINIT_FUNCTION(http_support)
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_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);
HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_COMMA", HTTP_PARAMS_ALLOW_COMMA);
HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_FAILURE", HTTP_PARAMS_ALLOW_FAILURE);
@@
-50,6
+52,9
@@
PHP_HTTP_API long _http_support(long feature)
# ifdef HTTP_HAVE_SSL
support |= HTTP_SUPPORT_SSLREQUESTS;
# endif
# 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;
#endif
#ifdef HTTP_HAVE_MAGIC
support |= HTTP_SUPPORT_MAGICMIME;
@@
-90,6
+95,13
@@
char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x
}
/* }}} */
}
/* }}} */
+/* {{{ 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, ...)
{
/* {{{ void http_error(long, long, char*) */
void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
{
@@
-97,7
+109,7
@@
void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
va_start(args, format);
#ifdef ZEND_ENGINE_2
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);
char *message;
zend_class_entry *ce = http_exception_get_for_code(code);
@@
-105,7
+117,7
@@
void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
vspprintf(&message, 0, format, args);
zend_throw_exception(ce, message, code TSRMLS_CC);
efree(message);
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);
} else
#endif
php_verror(NULL, "", type, format, args TSRMLS_CC);
@@
-180,7
+192,7
@@
STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uint cname
zend_class_entry *ce = parent_ce;
if (cname_str && cname_len) {
zend_class_entry *ce = parent_ce;
if (cname_str && cname_len) {
- if (!(ce = zend_fetch_class((char *) cname_str, cname_len, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC))) {
+ 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)) {
return FAILURE;
}
if (!instanceof_function(ce, parent_ce TSRMLS_CC)) {
@@
-310,7
+322,7
@@
PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_len, zend
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(&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_len + 1, (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 NULL;
}
if (check && !((Z_TYPE_PP(var) == IS_STRING) && Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) {