Added patch to make sure Winhttp raw request headers are terminated using double \r\n.

README.md

@@ -39,7 +39,7 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [7]:**
+**Bug fixes and features included in the next upcoming release [8]:**
 
 * Add stub dlls required for MSVC 2015 runtime library (Windows 10)
 * Add stubs for additional wininet options in InternetSetOption
@@ -48,6 +48,7 @@ Included bug fixes and improvements
 * Implement stub for vcomp._vcomp_flush ([Wine Bug #39058](https://bugs.winehq.org/show_bug.cgi?id=39058))
 * Improve stubs for dxgi MakeWindowAssociation and GetWindowAssociation
 * Move cookie initialization code from memory management to loader ([Wine Bug #39040](https://bugs.winehq.org/show_bug.cgi?id=39040))
+* Winhttp raw request headers must be terminated using double \r\n ([Wine Bug #35953](https://bugs.winehq.org/show_bug.cgi?id=35953))
 
 
 **Bug fixes and features in Wine Staging 1.7.48 [238]:**

debian/changelog

@@ -11,6 +11,8 @@ wine-staging (1.7.49) UNRELEASED; urgency=low
     loader.
   * Added patch to fake success in IViewObject::Draw stub.
   * Added patch to fix possible integer overflow in VarR4FromDec.
+  * Added patch to make sure Winhttp raw request headers are terminated using
+    double \r\n.
   * Removed patch to avoid race-conditions with long running threadpool tasks
     (accepted upstream).
   * Removed patch to add support for ThreadQuerySetWin32StartAddress info class

patches/patchinstall.sh

@@ -276,6 +276,7 @@ patch_enable_all ()
 	enable_winex11_Window_Style="$1"
 	enable_winex11_XEMBED="$1"
 	enable_winex11_wglShareLists="$1"
+	enable_winhttp_Request_Headers="$1"
 	enable_winhttp_System_Proxy_Autoconfig="$1"
 	enable_wininet_Cleanup="$1"
 	enable_wininet_Internet_Settings="$1"
@@ -909,6 +910,9 @@ patch_enable ()
 		winex11-wglShareLists)
 			enable_winex11_wglShareLists="$2"
 			;;
+		winhttp-Request_Headers)
+			enable_winhttp_Request_Headers="$2"
+			;;
 		winhttp-System_Proxy_Autoconfig)
 			enable_winhttp_System_Proxy_Autoconfig="$2"
 			;;
@@ -5683,6 +5687,23 @@ if test "$enable_winex11_wglShareLists" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset winhttp-Request_Headers
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#35953] Winhttp raw request headers must be terminated using double \r\n
+# |
+# | Modified files:
+# |   *	dlls/winhttp/request.c, dlls/winhttp/tests/winhttp.c
+# |
+if test "$enable_winhttp_Request_Headers" -eq 1; then
+	patch_apply winhttp-Request_Headers/0001-winhttp-Remove-unused-variable-in-read_reply.patch
+	patch_apply winhttp-Request_Headers/0002-winhttp-Raw-request-headers-needs-to-be-terminated-u.patch
+	(
+		echo '+    { "Michael Müller", "winhttp: Remove unused variable in read_reply().", 1 },';
+		echo '+    { "Michael Müller", "winhttp: Raw request headers needs to be terminated using double \\\\r\\\\n.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset winhttp-System_Proxy_Autoconfig
 # |
 # | Modified files:

patches/winhttp-Request_Headers/0001-winhttp-Remove-unused-variable-in-read_reply.patch

@@ -0,0 +1,45 @@
+From 15eaea1b23276347b7ac4d68dd0d9c0da709bf7b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 9 Aug 2015 15:28:37 +0200
+Subject: winhttp: Remove unused variable in read_reply().
+
+---
+ dlls/winhttp/request.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
+index 740a582..607b502 100644
+--- a/dlls/winhttp/request.c
++++ b/dlls/winhttp/request.c
+@@ -2092,19 +2092,17 @@ static BOOL read_reply( request_t *request )
+     static const WCHAR crlf[] = {'\r','\n',0};
+ 
+     char buffer[MAX_REPLY_LEN];
+-    DWORD buflen, len, offset, received_len, crlf_len = 2; /* strlenW(crlf) */
++    DWORD buflen, len, offset, crlf_len = 2; /* strlenW(crlf) */
+     char *status_code, *status_text;
+     WCHAR *versionW, *status_textW, *raw_headers;
+     WCHAR status_codeW[4]; /* sizeof("nnn") */
+ 
+     if (!netconn_connected( &request->netconn )) return FALSE;
+ 
+-    received_len = 0;
+     do
+     {
+         buflen = MAX_REPLY_LEN;
+         if (!read_line( request, buffer, &buflen )) return FALSE;
+-        received_len += buflen;
+ 
+         /* first line should look like 'HTTP/1.x nnn OK' where nnn is the status code */
+         if (!(status_code = strchr( buffer, ' ' ))) return FALSE;
+@@ -2157,7 +2155,6 @@ static BOOL read_reply( request_t *request )
+ 
+         buflen = MAX_REPLY_LEN;
+         if (!read_line( request, buffer, &buflen )) return TRUE;
+-        received_len += buflen;
+         if (!*buffer) break;
+ 
+         while (len - offset < buflen + crlf_len)
+-- 
+2.5.0
+

patches/winhttp-Request_Headers/0002-winhttp-Raw-request-headers-needs-to-be-terminated-u.patch

@@ -0,0 +1,100 @@
+From e6a6251091cdffd205827f5755622ad2b787aa0c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 9 Aug 2015 16:44:49 +0200
+Subject: winhttp: Raw request headers needs to be terminated using double
+ \r\n.
+
+---
+ dlls/winhttp/request.c       | 14 ++++++++------
+ dlls/winhttp/tests/winhttp.c | 18 ++++++++++++++++++
+ 2 files changed, 26 insertions(+), 6 deletions(-)
+
+diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c
+index 607b502..498df2b 100644
+--- a/dlls/winhttp/request.c
++++ b/dlls/winhttp/request.c
+@@ -672,11 +672,8 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID
+         if (!(p = headers)) return FALSE;
+         for (len = 0; *p; p++) if (*p != '\r') len++;
+ 
+-        if (!buffer || (len + 1) * sizeof(WCHAR) > *buflen)
+-        {
+-            len++;
++        if (!buffer || len * sizeof(WCHAR) > *buflen)
+             set_last_error( ERROR_INSUFFICIENT_BUFFER );
+-        }
+         else
+         {
+             for (p = headers, q = buffer; *p; p++, q++)
+@@ -688,8 +685,8 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID
+                     p++; /* skip '\n' */
+                 }
+             }
+-            *q = 0;
+             TRACE("returning data: %s\n", debugstr_wn(buffer, len));
++            if (len) len--;
+             ret = TRUE;
+         }
+         *buflen = len * sizeof(WCHAR);
+@@ -2155,7 +2152,7 @@ static BOOL read_reply( request_t *request )
+ 
+         buflen = MAX_REPLY_LEN;
+         if (!read_line( request, buffer, &buflen )) return TRUE;
+-        if (!*buffer) break;
++        if (!*buffer) buflen = 1;
+ 
+         while (len - offset < buflen + crlf_len)
+         {
+@@ -2164,6 +2161,11 @@ static BOOL read_reply( request_t *request )
+             if (!(tmp = heap_realloc( raw_headers, len * sizeof(WCHAR) ))) return FALSE;
+             request->raw_headers = raw_headers = tmp;
+         }
++        if (!*buffer)
++        {
++            memcpy( raw_headers + offset, crlf, sizeof(crlf) );
++            break;
++        }
+         MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen );
+ 
+         if (!(header = parse_header( raw_headers + offset ))) break;
+diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
+index cb462bb..3131dcf 100644
+--- a/dlls/winhttp/tests/winhttp.c
++++ b/dlls/winhttp/tests/winhttp.c
+@@ -2126,8 +2126,11 @@ static DWORD CALLBACK server_thread(LPVOID param)
+ 
+ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path)
+ {
++    static const WCHAR test_header_end_clrf[] = {'\r','\n','\r','\n',0};
++    static const WCHAR test_header_end_raw[] = {0,0};
+     HINTERNET ses, con, req;
+     char buffer[0x100];
++    WCHAR buffer2[0x100];
+     DWORD count, status, size, error, supported, first, target;
+     BOOL ret;
+ 
+@@ -2162,6 +2165,21 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path)
+     ok(first == 0xdeadbeef, "got %x\n", first);
+     ok(target == 0xdeadbeef, "got %x\n", target);
+ 
++    size = sizeof(buffer2);
++    memset(buffer2, 0, sizeof(buffer2));
++    ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buffer2, &size, NULL);
++    ok(ret, "failed to query for raw headers: %u\n", GetLastError());
++    ok(memcmp(buffer2 + lstrlenW(buffer2) - 4, test_header_end_clrf, sizeof(test_header_end_clrf)) == 0,
++       "WinHttpQueryHeaders returned invalid end of header string\n");
++
++    size = sizeof(buffer2);
++    memset(buffer2, 0, sizeof(buffer2));
++    ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS, NULL, buffer2, &size, NULL);
++    ok(ret, "failed to query for raw headers: %u\n", GetLastError());
++    ok(memcmp(buffer2 + (size / sizeof(WCHAR)) - 1, test_header_end_raw, sizeof(test_header_end_raw)) == 0,
++       "WinHttpQueryHeaders returned invalid end of header string\n");
++    ok(buffer2[(size / sizeof(WCHAR)) - 2] != 0, "String has too many NULL characters\n");
++
+     count = 0;
+     memset(buffer, 0, sizeof(buffer));
+     ret = WinHttpReadData(req, buffer, sizeof buffer, &count);
+-- 
+2.5.0
+

patches/winhttp-Request_Headers/definition

@@ -0,0 +1 @@
+Fixes: [35953] Winhttp raw request headers must be terminated using double \r\n