* Don't send 100-Continue when there was no Expect: 100-continue in the

  request headers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@664150 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/protocol.c b/server/protocol.c
index 74dad061b2f417aaed3d3853cd52f71afa914366..8fc5c7f0c0e66b3f89645812c2844d26ba3dd2b4 100644 (file)
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1648,6 +1648,14 @@ AP_DECLARE(void) ap_send_interim_response(request_rec *r, int send_headers)
                       "Status is %d - not sending interim response", r->status);
         return;
     }
+    if ((r->status == HTTP_CONTINUE) && !r->expecting_100) {
+        /*
+         * Don't send 100-Continue when there was no Expect: 100-continue
+         * in the request headers. For origin servers this is a SHOULD NOT
+         * for proxies it is a MUST NOT according to RFC 2616 8.2.3
+         */
+        return;
+    }
 
     x.f = r->connection->output_filters;
     x.bb = apr_brigade_create(r->pool, r->connection->bucket_alloc);