summaryrefslogtreecommitdiffstats
path: root/modules/http
diff options
context:
space:
mode:
authorRyan Bloom <rbb@apache.org>2000-11-09 01:37:06 +0100
committerRyan Bloom <rbb@apache.org>2000-11-09 01:37:06 +0100
commit4ee1d8eb592a5bfb744c6e6a4175b50a7d52703b (patch)
tree7ec5fbb922206591256906f429e990197dc824b7 /modules/http
parentWhen caching file handles (vs. mmaps) reset the file pointer (diff)
downloadapache2-4ee1d8eb592a5bfb744c6e6a4175b50a7d52703b.tar.xz
apache2-4ee1d8eb592a5bfb744c6e6a4175b50a7d52703b.zip
Remove BUFF from the main server. :-) The buff code needs to remain as
a part of the server until the proxy is purged of BUFF however. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86878 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http')
-rw-r--r--modules/http/http_protocol.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index cbfc8e05af..b440b4e69f 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1169,11 +1169,23 @@ 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.
*/
+#if 0
+ /* XXX: I am 99% sure that these are already taken care of, but I want to
+ * really investigate them still. Removing them from the code doesn't
+ * hurt however, because nothing is using BUFF anymore.
+ */
ap_bsetflag(conn->client, B_SAFEREAD, 1);
ap_bflush(conn->client);
+#endif
while ((len = getline(l, sizeof(l), r, 0)) <= 0) {
if (len < 0) { /* includes EOF */
+#if 0
+ /* XXX: I am 99% sure that these are already taken care of, but I want to
+ * really investigate them still. Removing them from the code doesn't
+ * hurt however, because nothing is using BUFF anymore.
+ */
ap_bsetflag(conn->client, B_SAFEREAD, 0);
+#endif
/* this is a hack to make sure that request time is set,
* it's not perfect, but it's better than nothing
*/
@@ -1194,7 +1206,13 @@ static int read_request_line(request_rec *r)
#endif
*/
+#if 0
+ /* XXX: I am 99% sure that these are already taken care of, but I want to
+ * really investigate them still. Removing them from the code doesn't
+ * hurt however, because nothing is using BUFF anymore.
+ */
ap_bsetflag(conn->client, B_SAFEREAD, 0);
+#endif
r->request_time = apr_now();
r->the_request = apr_pstrdup(r->pool, l);