MFB: various bug fixes

diff --git a/NEWS b/NEWS
index 0c16d62587c036d505c4bba75086394bfa1797d0..78dda00fb18f318eb1e88198c6cc78e0a4d7cd4c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,11 @@ PHP                                                                        NEWS
 - Fixed possible stack buffer overflow in FastCGI SAPI. (Andrei Nigmatulin)
 - Fixed sending of uninitialized paddings which may contain some information.
   (Andrei Nigmatulin)
+- Fixed bug #44663 (Crash in imap_mail_compose if "body" parameter invalid).
+  (Ilia)
 - Fixed bug #44613 (Crash inside imap_headerinfo()). (Ilia, jmessa)
+- Fixed bug #44603 (Order issues with Content-Type/Length headers on
+  POST). (Ilia)
 - Fixed bug #44594 (imap_open() does not validate # of retries parameter).
   (Ilia)
 - Fixed bug #44557 (Crash in imap_setacl when supplied integer as username)

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 9fe4f4cbd997a08967b62ea526f5d48a8b8fa6db..a67e78b8876a97eaae90ba6f702e0a356323d5fe 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -3041,8 +3041,8 @@ PHP_FUNCTION(imap_mail_compose)
        }
 
        zend_hash_internal_pointer_reset(Z_ARRVAL_PP(body));
-       if (zend_hash_get_current_data(Z_ARRVAL_PP(body), (void **) &data) != SUCCESS) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter cannot be empty");
+       if (zend_hash_get_current_data(Z_ARRVAL_PP(body), (void **) &data) != SUCCESS || Z_TYPE_PP(data) != IS_ARRAY) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "body parameter must be a non-empty array");
                RETURN_FALSE;
        }
 

diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c
index 2834cf8e2879eb7eb86ab97908f17eef74075d33..0a09b12528a991e0301b314fa10f97a4b0185343 100644 (file)
--- a/ext/standard/http_fopen_wrapper.c
+++ b/ext/standard/http_fopen_wrapper.c
@@ -105,6 +105,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
        char *protocol_version = NULL;
        int protocol_version_len = 3; /* Default: "1.0" */
        struct timeval timeout;
+       char *user_headers = NULL;
 
        tmp_line[0] = '\0';
 
@@ -351,10 +352,8 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
                                efree(tmp);
                                tmp = tmp_c;
                        }
-               
-                       /* Output trimmed headers with \r\n at the end */
-                       php_stream_write(stream, tmp, strlen(tmp));
-                       php_stream_write(stream, "\r\n", sizeof("\r\n") - 1);
+
+                       user_headers = estrdup(tmp);
 
                        /* Make lowercase for easy comparison against 'standard' headers */
                        php_strtolower(tmp, strlen(tmp));
@@ -452,6 +451,27 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path,
                }       
        }
 
+       if (user_headers) {
+               /* A bit weird, but some servers require that Content-Length be sent prior to Content-Type for POST
+                * see bug #44603 for details. Since Content-Type maybe part of user's headers we need to do this check first.
+                */
+               if (
+                               header_init &&
+                               context &&
+                               !(have_header & HTTP_HEADER_CONTENT_LENGTH) &&
+                               php_stream_context_get_option(context, "http", "content", &tmpzval) == SUCCESS &&
+                               Z_TYPE_PP(tmpzval) == IS_STRING && Z_STRLEN_PP(tmpzval) > 0
+               ) {
+                       scratch_len = slprintf(scratch, scratch_len, "Content-Length: %d\r\n", Z_STRLEN_PP(tmpzval));
+                       php_stream_write(stream, scratch, scratch_len);
+                       have_header |= HTTP_HEADER_CONTENT_LENGTH;
+               }
+
+               php_stream_write(stream, user_headers, strlen(user_headers));
+               php_stream_write(stream, "\r\n", sizeof("\r\n")-1);
+               efree(user_headers);
+       }
+
        /* Request content, such as for POST requests */
        if (header_init && context &&
                php_stream_context_get_option(context, "http", "content", &tmpzval) == SUCCESS &&