From: Jim Jagielski <jim@apache.org>
Date: Wed, 10 Oct 2018 15:37:32 +0000 (+0000)
Subject: Merge r1839303, r1843290 from trunk:
X-Git-Tag: 2.4.36~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13f5446d8390a8fc3e7144e56cdc1e905ac71057;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1839303, r1843290 from trunk:

These need to be signed longs... cast as needed.


Add CHANGES entry
Submitted by: jim, jailletc36
Reviewed by: jailletc36 (by inspection), ylavic, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1843467 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 1a588d9d8f1..0b109fc6da9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.36
 
+  *) mod_proxy_scgi, mod_proxy_uwsgi: improve error handling when sending the
+     body of the response. [Jim Jagielski]
+
   *) ab: Add client certificate support. [Graham Leggett]
 
   *) ab: Disable printing temp key for OpenSSL before
diff --git a/STATUS b/STATUS
index 622113300ad..2e5aef65c78 100644
--- a/STATUS
+++ b/STATUS
@@ -136,13 +136,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      in the 2.4.x patch.
      +1: kotkov, ylavic, jim
 
-  *) mod_proxy_scgi, mod_proxy_uwsgi: These need to be signed longs otherwise,
-     the error handling code can never trigger.
-     trunk patch: http://svn.apache.org/r1839303
-                  http://svn.apache.org/r1843290 (CHANGES entry)
-     2.4.x patch: svn merge -c 1839303,1843290 ^/httpd/httpd/trunk . 
-     +1: jailletc36 (by inspection), ylavic, jim
-
   *) mod_http2: fixing an issue that h2 stream do not properly EOS when
      the bucket is missing in the handler response.
      trunk patch: http://svn.apache.org/r1843426
diff --git a/modules/proxy/mod_proxy_scgi.c b/modules/proxy/mod_proxy_scgi.c
index cede817a7ea..11f75deaa9f 100644
--- a/modules/proxy/mod_proxy_scgi.c
+++ b/modules/proxy/mod_proxy_scgi.c
@@ -19,7 +19,7 @@
  * Proxy backend module for the SCGI protocol
  * (http://python.ca/scgi/protocol.txt)
  *
- * André Malo (nd/perlig.de), August 2007
+ * Andr� Malo (nd/perlig.de), August 2007
  */
 
 #define APR_WANT_MEMFUNC
@@ -334,11 +334,11 @@ static int send_request_body(request_rec *r, proxy_conn_rec *conn)
     if (ap_should_client_block(r)) {
         char *buf = apr_palloc(r->pool, AP_IOBUFSIZE);
         int status;
-        apr_size_t readlen;
+        long readlen;
 
         readlen = ap_get_client_block(r, buf, AP_IOBUFSIZE);
         while (readlen > 0) {
-            status = sendall(conn, buf, readlen, r);
+            status = sendall(conn, buf, (apr_size_t)readlen, r);
             if (status != OK) {
                 return HTTP_SERVICE_UNAVAILABLE;
             }
diff --git a/modules/proxy/mod_proxy_uwsgi.c b/modules/proxy/mod_proxy_uwsgi.c
index bc7e7f94148..c5d4f8e9a61 100644
--- a/modules/proxy/mod_proxy_uwsgi.c
+++ b/modules/proxy/mod_proxy_uwsgi.c
@@ -212,11 +212,11 @@ static int uwsgi_send_body(request_rec *r, proxy_conn_rec * conn)
     if (ap_should_client_block(r)) {
         char *buf = apr_palloc(r->pool, AP_IOBUFSIZE);
         int status;
-        apr_size_t readlen;
+        long readlen;
 
         readlen = ap_get_client_block(r, buf, AP_IOBUFSIZE);
         while (readlen > 0) {
-            status = uwsgi_send(conn, buf, readlen, r);
+            status = uwsgi_send(conn, buf, (apr_size_t)readlen, r);
             if (status != OK) {
                 return HTTP_SERVICE_UNAVAILABLE;
             }