- better fix

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index fa8ea70d2807566f5417b6330ecbaeab26c9c2e3..865790908423cf28792996286602b15b75f21349 100644 (file)
--- 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) {
@@ -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 1
+       fprintf(stderr, "DEBUG: %3d (%5zu) %.*s%s", type, length, length, data, data[length-1]=='\n'?"":"\n");
+#endif
+       
        if (type) {
                request->conv.last_type = type;
        }