X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=6528b97d303c843eab4220bd81a557755f6ac10a;hp=fa8ea70d2807566f5417b6330ecbaeab26c9c2e3;hb=a0c54cae89e6c61a7f76037aa891898e6bd86e15;hpb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d

diff --git a/http_request_api.c b/http_request_api.c
index fa8ea70..6528b97 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -87,16 +87,19 @@ static struct gcry_thread_cbs http_gnutls_tsl = {
 PHP_MINIT_FUNCTION(http_request)
 {
 #ifdef HTTP_NEED_OPENSSL_TSL
-	int i, c = CRYPTO_num_locks();
-	
-	http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
-	
-	for (i = 0; i < c; ++i) {
-		http_openssl_tsl[i] = tsrm_mutex_alloc();
+	/* mod_ssl, libpq or ext/curl might already have set thread lock callbacks */
+	if (!CRYPTO_get_id_callback()) {
+		int i, c = CRYPTO_num_locks();
+		
+		http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
+		
+		for (i = 0; i < c; ++i) {
+			http_openssl_tsl[i] = tsrm_mutex_alloc();
+		}
+		
+		CRYPTO_set_id_callback(http_openssl_thread_id);
+		CRYPTO_set_locking_callback(http_openssl_thread_lock);
 	}
-	
-	CRYPTO_set_id_callback(http_openssl_thread_id);
-	CRYPTO_set_locking_callback(http_openssl_thread_lock);
 #endif
 #ifdef HTTP_NEED_GNUTLS_TSL
 	gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl);
@@ -138,10 +141,6 @@ PHP_MINIT_FUNCTION(http_request)
 /* {{{ MSHUTDOWN */
 PHP_MSHUTDOWN_FUNCTION(http_request)
 {
-#ifdef HTTP_NEED_OPENSSL_TSL
-	CRYPTO_set_id_callback(http_openssl_thread_id);
-	CRYPTO_set_locking_callback(http_openssl_thread_lock);
-#endif
 	curl_global_cleanup();
 #ifdef HTTP_NEED_OPENSSL_TSL
 	if (http_openssl_tsl) {
@@ -640,14 +639,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
 		FOREACH_KEYVAL(pos, zoption, header_key, header_val) {
 			if (header_key.type == HASH_KEY_IS_STRING) {
-				char header[1024] = {0};
+				char header[1024];
 				
 				ZVAL_ADDREF(*header_val);
 				convert_to_string_ex(header_val);
 				if (!strcasecmp(header_key.str, "range")) {
 					range_req = 1;
 				}
-				snprintf(header, lenof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val));
+				snprintf(header, sizeof(header), "%s: %s", header_key.str, Z_STRVAL_PP(header_val));
 				request->_cache.headers = curl_slist_append(request->_cache.headers, header);
 				zval_ptr_dtor(header_val);
 			}
@@ -655,12 +654,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	}
 	/* etag */
 	if ((zoption = http_request_option(request, options, "etag", IS_STRING)) && Z_STRLEN_P(zoption)) {
-		char match_header[1024] = {0}, *quoted_etag = NULL;
+		char match_header[1024], *quoted_etag = NULL;
 		
 		if ((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"')) {
 			spprintf(&quoted_etag, 0, "\"%s\"", Z_STRVAL_P(zoption));
 		}
-		snprintf(match_header, lenof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption));
+		snprintf(match_header, sizeof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption));
 		request->_cache.headers = curl_slist_append(request->_cache.headers, match_header);
 		STR_FREE(quoted_etag);
 	}
@@ -948,18 +947,20 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 {
 	http_request *request = (http_request *) ctx;
 
+#define EMPTY_HEADER(d, l) ((l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n'))
 	switch (type) {
 		case CURLINFO_DATA_IN:
 			if (request->conv.last_type == CURLINFO_HEADER_IN) {
 				phpstr_appends(&request->conv.response, HTTP_CRLF);
 			}
-		case CURLINFO_HEADER_IN:
 			phpstr_append(&request->conv.response, data, length);
 			break;
-		case CURLINFO_DATA_OUT:
-			if (request->conv.last_type == CURLINFO_HEADER_OUT) {
-				phpstr_appends(&request->conv.request, HTTP_CRLF);
+		case CURLINFO_HEADER_IN:
+			if (!EMPTY_HEADER(data, length)) {
+				phpstr_append(&request->conv.response, data, length);
 			}
+			break;
+		case CURLINFO_DATA_OUT:
 		case CURLINFO_HEADER_OUT:
 			phpstr_append(&request->conv.request, data, length);
 			break;
@@ -981,13 +982,14 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 			if (data[length-1] != 0xa) {
 				fprintf(stderr, "\n");
 			}
-#endif
-#if 0
-			fprintf(stderr, "%.*s%s", length, data, data[length-1]=='\n'?"":"\n");
 #endif
 			break;
 	}
 
+#if 0
+	fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n");
+#endif
+	
 	if (type) {
 		request->conv.last_type = type;
 	}