You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/04/07 01:54:00 UTC
cvs commit: apache-2.0/src/modules/standard mod_asis.c mod_autoindex.c mod_cgi.c mod_negotiation.c
rbb 00/04/06 16:54:00
Modified: src/lib/apr/file_io/unix open.c
src/main util.c
src/modules/standard mod_asis.c mod_autoindex.c mod_cgi.c
mod_negotiation.c
Log:
Make the server work without asking for buffered file I/O. This removes
all APR_BUFFERED flags from the server, and it fixes a minor bug in the
ungetchar patch (I forgot a file when comitting).
Revision Changes Path
1.42 +1 -0 apache-2.0/src/lib/apr/file_io/unix/open.c
Index: open.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- open.c 2000/04/06 23:25:05 1.41
+++ open.c 2000/04/06 23:53:58 1.42
@@ -160,6 +160,7 @@
}
(*new)->pipe = 0;
(*new)->timeout = -1;
+ (*new)->ungetchar = -1;
(*new)->eof_hit = 0;
ap_register_cleanup((*new)->cntxt, (void *)(*new), file_cleanup,
ap_null_cleanup);
1.36 +1 -1 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- util.c 2000/03/31 08:44:20 1.35
+++ util.c 2000/04/06 23:53:58 1.36
@@ -848,7 +848,7 @@
return APR_EACCES;
}
- stat = ap_open(&file, name, APR_READ | APR_BUFFERED, APR_OS_DEFAULT, p);
+ stat = ap_open(&file, name, APR_READ, APR_OS_DEFAULT, p);
#ifdef DEBUG
ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, NULL,
"Opening config file %s (%s)",
1.19 +1 -1 apache-2.0/src/modules/standard/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_asis.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mod_asis.c 2000/03/31 09:05:15 1.18
+++ mod_asis.c 2000/04/06 23:53:59 1.19
@@ -82,7 +82,7 @@
return NOT_FOUND;
}
- if ((status = ap_open(&f, r->filename, APR_READ | APR_BUFFERED,
+ if ((status = ap_open(&f, r->filename, APR_READ,
APR_OS_DEFAULT, r->pool)) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
"file permissions deny server access: %s", r->filename);
1.27 +3 -3 apache-2.0/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_autoindex.c 2000/03/31 09:05:15 1.26
+++ mod_autoindex.c 2000/04/06 23:53:59 1.27
@@ -992,7 +992,7 @@
* the file's contents, any HTML header it had won't end up
* where it belongs.
*/
- if (ap_open(&f, rr->filename, APR_READ | APR_BUFFERED,
+ if (ap_open(&f, rr->filename, APR_READ,
APR_OS_DEFAULT, r->pool) == APR_SUCCESS) {
emit_preamble(r, title);
emit_amble = 0;
@@ -1060,7 +1060,7 @@
/*
* If we can open the file, suppress the signature.
*/
- if (ap_open(&f, rr->filename, APR_READ | APR_BUFFERED,
+ if (ap_open(&f, rr->filename, APR_READ,
APR_OS_DEFAULT, r->pool) == APR_SUCCESS) {
do_emit_plain(r, f);
ap_close(f);
@@ -1097,7 +1097,7 @@
"text/html")
|| !strcmp(r->content_type, INCLUDES_MAGIC_TYPE))
&& !r->content_encoding) {
- if (ap_open(&thefile, r->filename, APR_READ | APR_BUFFERED,
+ if (ap_open(&thefile, r->filename, APR_READ,
APR_OS_DEFAULT, r->pool) != APR_SUCCESS) {
return NULL;
}
1.34 +1 -1 apache-2.0/src/modules/standard/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cgi.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_cgi.c 2000/03/31 09:05:16 1.33
+++ mod_cgi.c 2000/04/06 23:53:59 1.34
@@ -185,7 +185,7 @@
((stat(ap_server_root_relative(r->pool, conf->logname), &finfo) == 0)
&& (finfo.st_size > conf->logbytes)) ||
(ap_open(&f, ap_server_root_relative(r->pool, conf->logname),
- APR_APPEND | APR_BUFFERED, APR_OS_DEFAULT, r->pool) != APR_SUCCESS)) {
+ APR_APPEND, APR_OS_DEFAULT, r->pool) != APR_SUCCESS)) {
return ret;
}
1.25 +1 -1 apache-2.0/src/modules/standard/mod_negotiation.c
Index: mod_negotiation.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mod_negotiation.c 2000/04/05 19:24:46 1.24
+++ mod_negotiation.c 2000/04/06 23:53:59 1.25
@@ -792,7 +792,7 @@
/* We are not using multiviews */
neg->count_multiviews_variants = 0;
- if ((status = ap_open(&map, rr->filename, APR_READ | APR_BUFFERED,
+ if ((status = ap_open(&map, rr->filename, APR_READ,
APR_OS_DEFAULT, neg->pool)) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, status, r,
"cannot access type map file: %s", rr->filename);