@@ -359,6 +359,8 @@ private:
* is contained in this method.
*/
int handleRequest(request_rec *r) {
+ /********** Step 1: preparation work **********/
+
/* Check whether an error occured in prepareRequest() that should be reported
* to the browser.
*/
@@ -392,7 +394,10 @@ private:
return reportDocumentRootDeterminationError(r);
}
- int httpStatus = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR);
+
+ /********** Step 2: handle HTTP upload data, if any **********/
+
+ int httpStatus = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK);
if (httpStatus != OK) {
return httpStatus;
}
@@ -405,13 +410,36 @@ private:
Application::SessionPtr session;
bool expectingUploadData;
shared_ptr<BufferedUpload> uploadData;
+ const char *contentLength;
expectingUploadData = ap_should_client_block(r);
- if (expectingUploadData && atol(lookupHeader(r, "Content-Length"))
- > UPLOAD_ACCELERATION_THRESHOLD) {
- uploadData = receiveRequestBody(r);
+ contentLength = lookupHeader(r, "Content-Length");
+
+ // If the HTTP upload data is larger than a threshold, or if the HTTP
+ // client sent HTTP upload data using the "chunked" transfer encoding
+ // (which implies Content-Length == NULL), then buffer the upload
+ // data into a tempfile.
+ if (expectingUploadData && (
+ contentLength == NULL ||
+ atol(contentLength) > UPLOAD_ACCELERATION_THRESHOLD
+ )
+ ) {
+ uploadData = receiveRequestBody(r, contentLength);
}
+ if (expectingUploadData && contentLength == NULL) {
+ // In case of "chunked" transfer encoding, we'll set the
+ // Content-Length header to the length of the received upload
+ // data. Rails requires this header for its HTTP upload data
+ // multipart parsing process.
+ apr_table_set(r->headers_in, "Content-Length",
+ toString(ftell(uploadData->handle)).c_str());
+ }
+
+
+ /********** Step 3: forwarding the request to a backend
+ process from the application pool **********/
+
UPDATE_TRACE_POINT();
try {
ServerConfig *sconfig = getServerConfig(r->server);
@@ -469,6 +497,10 @@ private:
}
session->shutdownWriter();
+
+ /********** Step 4: forwarding the response from the backend
+ process back to the HTTP client **********/
+
UPDATE_TRACE_POINT();
apr_file_t *readerPipe = NULL;
int reader = session->getStream();
@@ -682,7 +714,16 @@ private:
return APR_SUCCESS;
}
- shared_ptr<BufferedUpload> receiveRequestBody(request_rec *r) {
+ /**
+ * Receive the HTTP upload data and buffer it into a BufferedUpload temp file.
+ *
+ * @param r The request.
+ * @param contentLength The value of the HTTP Content-Length header. This is used
+ * to check whether the HTTP client has sent complete upload
+ * data. NULL indicates that there is no Content-Length header,
+ * i.e. that the HTTP client used chunked transfer encoding.
+ */
+ shared_ptr<BufferedUpload> receiveRequestBody(request_rec *r, const char *contentLength) {
TRACE_POINT();
shared_ptr<BufferedUpload> tempFile(new BufferedUpload());
char buf[1024 * 32];
@@ -719,7 +760,8 @@ private:
if (len == -1) {
throw IOException("An error occurred while receiving HTTP upload data.");
}
- if (ftell(tempFile->handle) != atol(lookupHeader(r, "Content-Length"))) {
+
+ if (contentLength != NULL && ftell(tempFile->handle) != atol(contentLength)) {
throw IOException("The HTTP client sent incomplete upload data.");
}
return tempFile;
ext/apache2/Hooks.cpp
@@ -74,6 +74,28 @@ shared_examples_for "MyCook(tm) beta" do
end
end
+ it "supports HTTP POST with 'chunked' transfer encoding" do
+ uri = URI.parse(@server)
+ base_uri = uri.path.sub(%r(/$), '')
+ socket = TCPSocket.new(uri.host, uri.port)
+ begin
+ socket.write("POST #{base_uri}/uploads/single HTTP/1.1\r\n")
+ socket.write("Host: #{uri.host}\r\n")
+ socket.write("Transfer-Encoding: chunked\r\n")
+ socket.write("\r\n")
+
+ chunk = "foo=bar!"
+ socket.write("%X\r\n%s\r\n" % [chunk.size, chunk])
+ socket.write("0\r\n")
+ socket.close_write
+
+ lines = socket.read.split(/\r?\n/)
+ lines.last.should == "bar!"
+ ensure
+ socket.close
+ end
+ end
+
it "can properly handle custom headers" do
response = get_response('/welcome/headers_test')
response["X-Foo"].should == "Bar"
test/integration_tests.rb
@@ -8,4 +8,8 @@ class UploadsController < ApplicationController
"name 2 = " + params[:upload][:name2] + "\n" +
"data = " + params[:upload][:data].read
end
+
+ def single
+ render :text => params[:foo]
+ end
end
test/stub/rails_apps/mycook/app/controllers/uploads_controller.rb
@@ -25,7 +25,7 @@ ActionController::Routing::Routes.draw do |map|
# end
map.resources :recipes
- map.resources :uploads
+ map.resources :uploads, :collection => { :single => :post }
# You can have the root of your site routed with map.root -- just remember to delete public/index.html.
map.root :controller => "welcome"
test/stub/rails_apps/mycook/config/routes.rb
e38d48ef3c84fccafebae00da272479784e8c89c
Hongli Lai (Phusion)
hongli@phusion.nl
http://github.com/FooBarWidget/passenger/commit/5038157db90d2cd12c65d29154774c98a9e6a0b7
5038157db90d2cd12c65d29154774c98a9e6a0b7
2009-04-01T06:18:50-07:00
2009-04-01T04:55:15-07:00
Add support for HTTP uploads that use the 'chunked' transfer encoding. Fixes issue #114.
827da48e136739e8f1c517d5891c386fc000ec4b
Hongli Lai (Phusion)
hongli@phusion.nl