www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Make the server work without asking for buffered file I/O. This removes

Browse Source 
all APR_BUFFERED flags from the server, and it fixes a minor bug in the
ungetchar patch (I forgot a file when comitting).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84933 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Bloom
2000-04-06 23:53:59 +00:00
parent e58d3176f1
commit db9d037c36
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/generators/mod_asis.c
View File

@@ -82,7 +82,7 @@ static int asis_handler(request_rec *r)
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);

6
modules/generators/mod_autoindex.c
View File

@@ -992,7 +992,7 @@ static void emit_head(request_rec *r, char *header_fname, int suppress_amble,
* 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 @@ static void emit_tail(request_rec *r, char *readme_fname, int suppress_amble)
/*
* 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 @@ static char *find_title(request_rec *r)
"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;
}

2
modules/generators/mod_cgi.c
View File

@@ -185,7 +185,7 @@ static int log_scripterror(request_rec *r, cgi_server_conf * conf, int ret,
((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;
}

2
modules/mappers/mod_negotiation.c
View File

@@ -792,7 +792,7 @@ static int read_type_map(negotiation_state *neg, request_rec *rr)
/* 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);

2
server/util.c
View File

@@ -848,7 +848,7 @@ API_EXPORT(ap_status_t) ap_pcfg_openfile(configfile_t **ret_cfg, ap_context_t *p
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)",