fixed a bug with Apache2.

shugo · Sep 10, 2004 · 621adf8 · 621adf8
1 parent 61b3065
commit 621adf8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 10 18:04:48 2004  Shugo Maeda  <shugo@modruby.net>
+
+	* request.c (request_send_fd): fixed a bug with Apache2.
+
 Sun Aug 29 10:56:53 2004  NISHI Takao  <zophos@Dadd9.com>
 
 	* mod_ruby.c (mod_ruby_setenv): call ruby_unsetenv() before

diff --git a/request.c b/request.c
@@ -1472,12 +1472,14 @@ static VALUE request_bytes_sent(VALUE self)
 static VALUE request_send_fd(VALUE self, VALUE io)
 {
     OpenFile *fptr;
+    request_data *data;
 #ifdef APACHE2
     apr_size_t bytes_sent;
+    apr_file_t *file;
+    int fd;
 #else
     long bytes_sent;
 #endif
-    request_data *data;
 
     request_set_sync(self, Qtrue);
     rb_apache_request_flush(self);    
@@ -1486,7 +1488,11 @@ static VALUE request_send_fd(VALUE self, VALUE io)
     GetOpenFile(io, fptr);
 
 #ifdef APACHE2
-    ap_send_fd((apr_file_t *)fptr->f, data->request, 0, -1, &bytes_sent);
+    fd = fileno(fptr->f);
+    if (apr_os_file_put(&file, &fd, 0, data->request->pool) != APR_SUCCESS) {
+	rb_raise(rb_eIOError, "apr_os_file_put() failed");
+    }
+    ap_send_fd(file, data->request, 0, -1, &bytes_sent);
 #else
     bytes_sent = ap_send_fd_length(fptr->f, data->request, -1);
 #endif