X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=77b11348c0a0bfc484d3120de9dcb2b1a08ab12b;hp=e71b0879955cc66d120517f00ece623310a16138;hb=a88a9ab5ca6e1aa2d2510c7ff3dda58d528602e5;hpb=5eab9789044c40c91512d27ba5663cdf04b8b972

diff --git a/http_api.c b/http_api.c
index e71b087..77b1134 100644
--- a/http_api.c
+++ b/http_api.c
@@ -109,7 +109,7 @@ 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);
 		
@@ -117,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);
-		} 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);
@@ -192,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) {
-		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)) {
@@ -322,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(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))) {