Replace file descriptor with APRFile [Dean]

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

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 3824c1aba069813f7274eb68b9d165bab561a34f..dedf1345899b87f4b21e9126f09c10a6ef251c64 100644 (file)
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -131,8 +131,8 @@ API_EXPORT(int) ap_meets_conditions(request_rec *r);
  * (Ditto the send_header stuff).
  */
 
-API_EXPORT(long) ap_send_fd(FILE *f, request_rec *r);
-API_EXPORT(long) ap_send_fd_length(FILE *f, request_rec *r, long length);
+API_EXPORT(long) ap_send_fd(APRFile fd, request_rec *r);
+API_EXPORT(long) ap_send_fd_length(APRFile fd, request_rec *r, long length);
 
 API_EXPORT(long) ap_send_fb(BUFF *f, request_rec *r);
 API_EXPORT(long) ap_send_fb_length(BUFF *f, request_rec *r, long length);

diff --git a/include/httpd.h b/include/httpd.h
index 7f19d99cc52060c95e3d76f13dccb38e5af20369..3dbe5e4dcaa98cfb05c9ac7e5fea8b42bd2eac9e 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -72,6 +72,7 @@ extern "C" {
 #include "alloc.h"
 #include "buff.h"
 #include "ap.h"
+#include "apr.h"
 
 /* ----------------------------- config dir ------------------------------ */
 
@@ -1110,7 +1111,7 @@ extern API_VAR_EXPORT time_t ap_restart_time;
 #ifdef NO_SLACK
 #define ap_slack(fd,line)   (fd)
 #else
-int ap_slack(int fd, int line);
+APRFile ap_slack(APRFile fd, int line);
 #define AP_SLACK_LOW   1
 #define AP_SLACK_HIGH  2
 #endif

diff --git a/include/util_md5.h b/include/util_md5.h
index 0a0dc9c9b3c68a48ef894b2c06108d34bbd23c32..58cfefd6807f3fc7ec8ba39bd6437eddc337d3dd 100644 (file)
--- a/include/util_md5.h
+++ b/include/util_md5.h
@@ -70,7 +70,7 @@ API_EXPORT(char *) ap_md5contextTo64(pool *p, AP_MD5_CTX * context);
 #ifdef CHARSET_EBCDIC
 API_EXPORT(char *) ap_md5digest(pool *p, FILE *infile, int convert);
 #else
-API_EXPORT(char *) ap_md5digest(pool *p, FILE *infile);
+API_EXPORT(char *) ap_md5digest(pool *p, APRFile infile);
 #endif /* CHARSET_EBCDIC */
 
 #ifdef __cplusplus