X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=78745ee9d0083082bf1e6095b735b081a3bb4abb;hp=372265a04052ce482568da9f8f44ff862b1a8b7e;hb=f39ea2b145caa37d9614a8a437ffd3d8914b52f0;hpb=5498a30670c7166d92df816e25f33467dd1033d0

diff --git a/http_api.c b/http_api.c
index 372265a..78745ee 100644
--- a/http_api.c
+++ b/http_api.c
@@ -67,15 +67,16 @@ PHP_HTTP_API long _http_support(long feature)
 /* char *pretty_key(char *, size_t, zend_bool, zend_bool) */
 char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen)
 {
+	size_t i;
+	int wasalpha;
+	
 	if (key && key_len) {
-		size_t i;
-		int wasalpha;
-		if ((wasalpha = isalpha((int) key[0]))) {
-			key[0] = (char) (uctitle ? toupper((int) key[0]) : tolower((int) key[0]));
+		if ((wasalpha = HTTP_IS_CTYPE(alpha, key[0]))) {
+			key[0] = (char) (uctitle ? HTTP_TO_CTYPE(upper, key[0]) : HTTP_TO_CTYPE(lower, key[0]));
 		}
 		for (i = 1; i < key_len; i++) {
-			if (isalpha((int) key[i])) {
-				key[i] = (char) (((!wasalpha) && uctitle) ? toupper((int) key[i]) : tolower((int) key[i]));
+			if (HTTP_IS_CTYPE(alpha, key[i])) {
+				key[i] = (char) (((!wasalpha) && uctitle) ? HTTP_TO_CTYPE(upper, key[i]) : HTTP_TO_CTYPE(lower, key[i]));
 				wasalpha = 1;
 			} else {
 				if (xhyphen && (key[i] == '_')) {
@@ -96,15 +97,15 @@ 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)) {
-			char *message;
-			zend_class_entry *ce = http_exception_get_for_code(code);
-			
-			http_try {
-				vspprintf(&message, 0, format, args);
-				zend_throw_exception(ce, message, code TSRMLS_CC);
-				efree(message);
-			} http_catch(ce);
+	if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) {
+		char *message;
+		zend_class_entry *ce = http_exception_get_for_code(code);
+		
+		http_try {
+			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);
 	} else
 #endif
 	php_verror(NULL, "", type, format, args TSRMLS_CC);
@@ -255,8 +256,8 @@ STATUS _http_check_method_ex(const char *method, const char *methods)
 	const char *found;
 
 	if (	(found = strstr(methods, method)) &&
-			(found == method || !isalpha(found[-1])) &&
-			(strlen(found) >= strlen(method) && !isalpha(found[strlen(method)]))) {
+			(found == method || !HTTP_IS_CTYPE(alpha, found[-1])) &&
+			(strlen(found) >= strlen(method) && !HTTP_IS_CTYPE(alpha, found[strlen(method)]))) {
 		return SUCCESS;
 	}
 	return FAILURE;