diff options
| -rw-r--r-- | ApacheCore.def | 12 | ||||
| -rw-r--r-- | libhttpd.def | 12 | ||||
| -rw-r--r-- | modules/http/http_protocol.c | 7 | ||||
| -rw-r--r-- | os/win32/os.h | 5 |
4 files changed, 18 insertions, 18 deletions
diff --git a/ApacheCore.def b/ApacheCore.def index 5661ef9be4..c94f791d25 100644 --- a/ApacheCore.def +++ b/ApacheCore.def @@ -100,7 +100,7 @@ EXPORTS ap_find_token @93 ap_get_basic_auth_pw @94 ap_get_client_block @95 - ap_get_gmtoff @96 +; ap_get_gmtoff @96 ap_get_limit_req_body @97 ap_get_remote_host @98 ap_get_remote_logname @99 @@ -108,7 +108,7 @@ EXPORTS ap_get_server_name @101 ap_get_server_port @102 ;ap_get_server_version @103 - ap_get_time @104 +; ap_get_time @104 ap_get_token @105 ap_getparents @106 ap_getword @107 @@ -119,7 +119,7 @@ EXPORTS ap_getword_nulls_nc @112 ap_getword_white @113 ap_getword_white_nc @114 - ap_gm_timestr_822 @115 +; ap_gm_timestr_822 @115 ap_gname2id @116 ap_handle_command @117 ;ap_hard_timeout @118 @@ -250,7 +250,7 @@ EXPORTS ; ap_table_set @243 ; ap_table_setn @244 ; ap_table_unset @245 - ap_tm2sec @246 +; ap_tm2sec @246 ap_uname2id @247 ;ap_unblock_alarms @248 ap_unescape_url @249 @@ -274,14 +274,14 @@ EXPORTS alias_module @267 ap_bprintf @268 ap_bvputs @269 - ap_day_snames @270 +; ap_day_snames @270 ;ap_extended_status @271 ap_limit_section @272 ap_loaded_modules @273 ap_log_error @274 ap_log_printf @275 ap_log_rerror @276 - ap_month_snames @277 +; ap_month_snames @277 ; ap_null_cleanup @278 ; ap_psprintf @279 ; ap_pstrcat @280 diff --git a/libhttpd.def b/libhttpd.def index 5661ef9be4..c94f791d25 100644 --- a/libhttpd.def +++ b/libhttpd.def @@ -100,7 +100,7 @@ EXPORTS ap_find_token @93 ap_get_basic_auth_pw @94 ap_get_client_block @95 - ap_get_gmtoff @96 +; ap_get_gmtoff @96 ap_get_limit_req_body @97 ap_get_remote_host @98 ap_get_remote_logname @99 @@ -108,7 +108,7 @@ EXPORTS ap_get_server_name @101 ap_get_server_port @102 ;ap_get_server_version @103 - ap_get_time @104 +; ap_get_time @104 ap_get_token @105 ap_getparents @106 ap_getword @107 @@ -119,7 +119,7 @@ EXPORTS ap_getword_nulls_nc @112 ap_getword_white @113 ap_getword_white_nc @114 - ap_gm_timestr_822 @115 +; ap_gm_timestr_822 @115 ap_gname2id @116 ap_handle_command @117 ;ap_hard_timeout @118 @@ -250,7 +250,7 @@ EXPORTS ; ap_table_set @243 ; ap_table_setn @244 ; ap_table_unset @245 - ap_tm2sec @246 +; ap_tm2sec @246 ap_uname2id @247 ;ap_unblock_alarms @248 ap_unescape_url @249 @@ -274,14 +274,14 @@ EXPORTS alias_module @267 ap_bprintf @268 ap_bvputs @269 - ap_day_snames @270 +; ap_day_snames @270 ;ap_extended_status @271 ap_limit_section @272 ap_loaded_modules @273 ap_log_error @274 ap_log_printf @275 ap_log_rerror @276 - ap_month_snames @277 +; ap_month_snames @277 ; ap_null_cleanup @278 ; ap_psprintf @279 ; ap_pstrcat @280 diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 361d2510a0..51eebc2ef2 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -2014,15 +2014,10 @@ API_EXPORT(int) ap_discard_request_body(request_rec *r) */ API_EXPORT(long) ap_send_fd(ap_file_t *fd, request_rec *r) { - long len; + long len = r->finfo.size; #ifdef HAVE_SENDFILE if (!r->chunked) { ap_bflush(r->connection->client); - if (ap_get_filesize(&len, fd) != APR_SUCCESS) { - ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, - "ap_send_fd: ap_get_filesize failed."); - return 0; - } if (iol_sendfile(r->connection->client->iol, fd, len, NULL, 0, 0) != APR_SUCCESS) { ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r, diff --git a/os/win32/os.h b/os/win32/os.h index 0dc876fd22..6cdad531b1 100644 --- a/os/win32/os.h +++ b/os/win32/os.h @@ -105,6 +105,7 @@ #define HAVE_CANONICAL_FILENAME #define HAVE_DRIVE_LETTERS #define HAVE_SENDFILE + typedef int uid_t; typedef int gid_t; typedef int pid_t; @@ -138,9 +139,13 @@ every configuration function as __stdcall. #ifndef S_ISDIR #define S_ISDIR(m) (((m) & S_IFDIR) == S_IFDIR) #endif + +#if 0 #ifndef S_ISREG #define S_ISREG(m) (((m)&(S_IFREG)) == (S_IFREG)) #endif +#endif + #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 |