Implement saferead in Apache 2.0. This has had minimal testing, and it

seems to work, but only really hammering on it will tell for sure.

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

diff --git a/STATUS b/STATUS
index dc1c58caf0ee90404dd762ee4194501ab2b95d59..9e11171573287631d812f1478d5b6aefb9bd47dc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 Apache 2.0 STATUS:
-Last modified at [$Date: 2000/05/23 21:50:57 $]
+Last modified at [$Date: 2000/05/24 19:18:57 $]
 
 Release:
 
@@ -23,9 +23,6 @@ RELEASE SHOWSTOPPERS:
             module.  This should be override-able of course.
           Status: Jim Jagielski is looking into this.
 
-    * Fix SAFEREAD.
-       see <Pine.LNX.4.21.0004101511380.7822-100000@twinlark.arctic.org>
-
     * Put back resource limit code
 
     * suEXEC doesn't work

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index 6c09e64cc85581ca937b1ae57d359859b19a4a63..e3baaadd03fee23486dd4dcc8461ea400969e091 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -866,12 +866,11 @@ static int read_request_line(request_rec *r)
      * read().  B_SAFEREAD ensures that the BUFF layer flushes if it will
      * have to block during a read.
      */
-    /* TODO: reimplement SAFEREAD external to BUFF using a layer */
-    /* //ap_bsetflag(conn->client, B_SAFEREAD, 1); */
+    ap_bsetflag(conn->client, B_SAFEREAD, 1); 
     ap_bflush(conn->client);
     while ((len = getline(l, sizeof(l), conn->client, 0)) <= 0) {
         if ((len < 0) || ap_bgetflag(conn->client, B_EOF)) {
-           /* //ap_bsetflag(conn->client, B_SAFEREAD, 0); */
+           ap_bsetflag(conn->client, B_SAFEREAD, 0);
            /* this is a hack to make sure that request time is set,
             * it's not perfect, but it's better than nothing 
             */
@@ -892,7 +891,7 @@ static int read_request_line(request_rec *r)
 #endif
     */
 
-    /* //ap_bsetflag(conn->client, B_SAFEREAD, 0); */
+    ap_bsetflag(conn->client, B_SAFEREAD, 0);
 
     r->request_time = ap_now();
     r->the_request = ap_pstrdup(r->pool, l);