Replace file descriptors with APRFile.

Submitted by:	Bill Stoddard

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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index e8197e50eabc77755d9abf8ecafdba66dc3dfafd..ed96a7d224067563fa181691af987909293973c9 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2519,12 +2519,12 @@ static int default_handler(request_rec *r)
        
 #if defined(OS2) || defined(WIN32)
     /* Need binary mode for OS/2 */
-    f = ap_pfopen(r->pool, r->filename, "rb");
+    fd = ap_popenf(r->pool, r->filename, O_RDONLY | O_BINARY, 0);
 #else
-    f = ap_pfopen(r->pool, r->filename, "r");
+    fd = ap_popenf(r->pool, r->filename, O_RDONLY, 0);
 #endif
 
-    if (f == NULL) {
+    if (fd == -1) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
                     "file permissions deny server access: %s", r->filename);
         return FORBIDDEN;
@@ -2536,6 +2536,7 @@ static int default_handler(request_rec *r)
     ap_table_setn(r->headers_out, "Accept-Ranges", "bytes");
     if (((errstatus = ap_meets_conditions(r)) != OK)
        || (errstatus = ap_set_content_length(r, r->finfo.st_size))) {
+        ap_pclosef(r->pool, fd);
         return errstatus;
     }
 
@@ -2546,7 +2547,7 @@ static int default_handler(request_rec *r)
        /* we need to protect ourselves in case we die while we've got the
         * file mmapped */
        mm = mmap(NULL, r->finfo.st_size, PROT_READ, MAP_PRIVATE,
-                 fileno(f), 0);
+                 fd, 0);
        if (mm == (caddr_t)-1) {
            ap_log_rerror(APLOG_MARK, APLOG_CRIT, r,
                         "default_handler: mmap failed: %s", r->filename);
@@ -2570,12 +2571,12 @@ static int default_handler(request_rec *r)
        convert_flag = ap_checkconv(r);
        if (d->content_md5 & 1) {
            ap_table_setn(r->headers_out, "Content-MD5",
-                         ap_md5digest(r->pool, f, convert_flag));
+                         ap_md5digest(r->pool, fd, convert_flag));
        }
 #else
        if (d->content_md5 & 1) {
            ap_table_setn(r->headers_out, "Content-MD5",
-                         ap_md5digest(r->pool, f));
+                         ap_md5digest(r->pool, fd));
        }
 #endif /* CHARSET_EBCDIC */
 
@@ -2585,23 +2586,19 @@ static int default_handler(request_rec *r)
        
        if (!r->header_only) {
            if (!rangestatus) {
-               ap_send_fd(f, r);
+               ap_send_fd(fd, r);
            }
            else {
                long offset, length;
                while (ap_each_byterange(r, &offset, &length)) {
-                   /*
-                    * Non zero returns are more portable than checking
-                    * for a return of -1.
-                    */
-                   if (fseek(f, offset, SEEK_SET)) {
-                       ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
-                             "Failed to fseek for byterange (%ld, %ld)",
-                             offset, length);
-                   }
-                   else {
-                       ap_send_fd_length(f, r, length);
+                   /* ZZZ change to AP func */
+                   if (lseek(fd, offset, SEEK_SET) == -1) {
+                       ap_log_error(APLOG_MARK, APLOG_ERR, r->server,
+                                 "error byteserving file: %s", r->filename);
+                       ap_pclosef(r->pool, fd);
+                       return HTTP_INTERNAL_SERVER_ERROR;
                    }
+                   ap_send_fd_length(fd, r, length);
                }
            }
        }
@@ -2642,7 +2639,7 @@ static int default_handler(request_rec *r)
     }
 #endif
 
-    ap_pfclose(r->pool, f);
+    ap_pclosef(r->pool, fd);
     return OK;
 }
 

diff --git a/server/vhost.c b/server/vhost.c
index d6443eab4a4550fa6c4efdf5e460825b1a5e5752..cd329b24c30dde87c5cb60a5ae36f20983b3b641 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -413,16 +413,18 @@ static ipaddr_chain *find_default_server(unsigned port)
 }
 
 
-static void dump_vhost_config(FILE *f)
+static void dump_vhost_config(APRFile fd)
 {
     int i;
     ipaddr_chain *ic;
     name_chain *nc;
     char buf[MAX_STRING_LEN];
+    FILE * f = fdopen(fd, "w");
 
     fprintf(f, "VirtualHost configuration:\n");
     for (i = 0; i < IPHASH_TABLE_SIZE; ++i) {
        for (ic = iphash_table[i]; ic; ic = ic->next) {
+         /* ZZZ should we change the Net addr to a string for this? */
            if (ic->sar->host_port == 0) {
                ap_snprintf(buf, sizeof(buf), "%pA:*", &ic->sar->host_addr);
            }