@@ -47,7 +47,9 @@ class RequestHandler < AbstractRequestHandler QUESTION_MARK = "?" # :nodoc: QUERY_STRING = "QUERY_STRING" # :nodoc: CONTENT_LENGTH = "CONTENT_LENGTH" # :nodoc: + CONTENT_TYPE = "CONTENT_TYPE" # :nodoc: HTTP_CONTENT_LENGTH = "HTTP_CONTENT_LENGTH" # :nodoc: + HTTP_CONTENT_TYPE = "HTTP_CONTENT_TYPE" # :nodoc: HTTPS = "HTTPS" # :nodoc: HTTPS_DOWNCASE = "https" # :nodoc: HTTP = "http" # :nodoc: @@ -76,12 +78,20 @@ protected env[QUERY_STRING] ||= "" env[PATH_INFO] ||= env[REQUEST_URI].split(QUESTION_MARK, 2).first env[PATH_INFO].sub!(/^#{Regexp.escape(env[SCRIPT_NAME])}/, "") + if env[HTTP_CONTENT_LENGTH] && env[CONTENT_LENGTH] env.delete(HTTP_CONTENT_LENGTH) elsif env[HTTP_CONTENT_LENGTH] && !env[CONTENT_LENGTH] env[CONTENT_LENGTH] = env[HTTP_CONTENT_LENGTH] env.delete(HTTP_CONTENT_LENGTH) end + if env[HTTP_CONTENT_TYPE] && env[CONTENT_TYPE] + env.delete(HTTP_CONTENT_TYPE) + elsif env[HTTP_CONTENT_TYPE] && !env[CONTENT_TYPE] + env[CONTENT_TYPE] = env[HTTP_CONTENT_TYPE] + env.delete(HTTP_CONTENT_TYPE) + end + if env[HTTPS] == YES || env[HTTPS] == ON || env[HTTPS] == ONE env[RACK_URL_SCHEME] = HTTPS_DOWNCASE else lib/phusion_passenger/rack/request_handler.rb 72416a55bff4c0dfe0aa7513e6963b3f9b4cdd7f Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/423a88a1c5180f0209e91f14c05e7bde82818928 423a88a1c5180f0209e91f14c05e7bde82818928 2009-07-05T03:47:20-07:00 2009-07-05T03:47:20-07:00 Rack handler: remove HTTP_CONTENT_TYPE in favor of CONTENT_TYPE. Fixes issue #333. 0016fce87e53c095639f85a679972cce73c82ca6 Hongli Lai (Phusion) hongli@phusion.nl