passenger 2.2.14 → 2.2.15

data/NEWS

@@ -1,3 +1,33 @@
+Release 2.2.15
+--------------
+
+ * [Apache] Fixed incorrect temp dir cleanup by passenger-status
+   On some systems, running passenger-status could print the following
+   message:
+   
+      *** Cleaning stale folder /tmp/passenger.1234
+   
+   ...after which Phusion Passenger breaks because that directory is
+   necessary for it to function properly. The cause of this problem
+   has been found and has been fixed.
+ * [Apache] Fixed some upload handling problems
+   Previous versions of Phusion Passenger check whether the size of
+   the received upload data matches the contents of the Content-Length
+   header as received by the client. It turns out that there could
+   be a mismatch e.g. because of mod_deflate input compression, so
+   we can't trust Content-Length anyway and we're being too strict.
+   The check has now been removed.
+ * [Nginx] Fixed compilation issues with Nginx >= 0.7.66
+   Thanks to Potamianos Gregory for reporting this issue. Issue #500.
+ * [Nginx] Default Nginx version changed to 0.7.67
+   The previous default version was 0.7.65.
+ * Fixed more Bundler problems
+   Previous versions of Phusion Passenger would preload some popular
+   libraries such as mysql and sqlite3 in order to utilize copy-on-write
+   optimizations better. However this behavior conflicts with Bundler
+   so we've removed it.
+
+
 Release 2.2.14
 --------------
 

data/bin/passenger-install-nginx-module

@@ -36,7 +36,7 @@ include PlatformInfo
 class Installer < PhusionPassenger::AbstractInstaller
 	include PhusionPassenger
 	
-	NGINX_VERSION = "0.7.65"
+	NGINX_VERSION = "0.7.67"
 	
 	def dependencies
 		result = [
@@ -149,8 +149,8 @@ private
 		new_screen
 		color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>"
 		
-		basename = "pcre-8.00.tar.gz"
-		dirname = "pcre-8.00"
+		basename = "pcre-8.02.tar.gz"
+		dirname = "pcre-8.02"
 		url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/#{basename}"
 		File.unlink("/tmp/#{basename}") rescue nil
 		FileUtils.rm_rf("/tmp/#{dirname}")

data/doc/Users guide Apache.html

@@ -3749,7 +3749,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-06-04 12:07:24 CEST
+Last updated 2010-06-24 13:53:02 CEST
 </div>
 </div>
 </body>

data/doc/Users guide Nginx.html

@@ -2427,7 +2427,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-06-04 12:07:24 CEST
+Last updated 2010-06-24 13:53:02 CEST
 </div>
 </div>
 </body>

data/ext/apache2/Hooks.cpp

@@ -506,17 +506,23 @@ private:
 			 */
 			if (expectingUploadData) {
 				if (contentLength == NULL || atol(contentLength) > LARGE_UPLOAD_THRESHOLD) {
-					uploadDataFile = receiveRequestBody(r, contentLength);
+					uploadDataFile = receiveRequestBody(r);
 				} else {
 					receiveRequestBody(r, contentLength, uploadDataMemory);
 				}
 			}
 			
-			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.
+			if (expectingUploadData) {
+				/* 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.
+				 * There are two reasons why we don't rely on the Content-Length
+				 * header as sent by the client:
+				 * - The client doesn't always send Content-Length, e.g. in case
+				 *   of "chunked" transfer encoding.
+				 * - mod_deflate input compression can make it so that the
+				 *   amount of upload we receive doesn't match Content-Length:
+				 *   http://httpd.apache.org/docs/2.0/mod/mod_deflate.html#enable
 				 */
 				if (uploadDataFile != NULL) {
 					apr_table_set(r->headers_in, "Content-Length",
@@ -1088,15 +1094,11 @@ private:
 	 * 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.
 	 * @throws RuntimeException
 	 * @throws SystemException
 	 * @throws IOException
 	 */
-	shared_ptr<BufferedUpload> receiveRequestBody(request_rec *r, const char *contentLength) {
+	shared_ptr<BufferedUpload> receiveRequestBody(request_rec *r) {
 		TRACE_POINT();
 		DirConfig *config = getDirConfig(r);
 		shared_ptr<BufferedUpload> tempFile;
@@ -1121,17 +1123,6 @@ private:
 			} while (written < (size_t) len);
 			total_written += written;
 		}
-		
-		if (contentLength != NULL && ftell(tempFile->handle) != atol(contentLength)) {
-			string message = "It looks like the browser did not finish the file upload: "
-				"it said it will upload ";
-			message.append(contentLength);
-			message.append(" bytes, but it closed the connection after sending ");
-			message.append(toString(ftell(tempFile->handle)));
-			message.append(" bytes. The user probably clicked Stop in the browser "
-				"or his Internet connection stalled.");
-			throw IOException(message);
-		}
 		return tempFile;
 	}
 	
@@ -1162,17 +1153,6 @@ private:
 		while ((len = readRequestBodyFromApache(r, buf, sizeof(buf))) > 0) {
 			buffer.append(buf, len);
 		}
-		
-		if (contentLength != NULL && buffer.size() != l_contentLength) {
-			string message = "It looks like the browser did not finish the file upload: "
-				"it said it will upload ";
-			message.append(contentLength);
-			message.append(" bytes, but it closed the connection after sending ");
-			message.append(toString(buffer.size()));
-			message.append(" bytes. The user probably clicked Stop in the browser "
-				"or his Internet connection stalled.");
-			throw IOException(message);
-		}
 	}
 	
 	void sendRequestBody(request_rec *r, Application::SessionPtr &session, shared_ptr<BufferedUpload> &uploadData) {
@@ -1257,6 +1237,13 @@ public:
 	
 	~Hooks() {
 		removeDirTree(getPassengerTempDir().c_str());
+		/* mod_passenger is loaded twice during Apache startup (load, unload, load),
+		 * but on OS X sometimes the old memory values of global variables can
+		 * stay behind and affect the next load. So here we empty the temp dir variable
+		 * explicitly so that the next load correctly calculates a new temp dir
+		 * filename using the after-daemonization Apache PID.
+		 */
+		setPassengerTempDir("");
 	}
 	
 	int prepareRequestWhenInHighPerformanceMode(request_rec *r) {

data/ext/common/Version.h

@@ -26,6 +26,6 @@
 #define _PASSENGER_VERSION_H_
 
 /* Don't forget to update lib/phusion_passenger/constants.rb too. */
-#define PASSENGER_VERSION "2.2.14"
+#define PASSENGER_VERSION "2.2.15"
 
 #endif /* _PASSENGER_VERSION_H */

data/ext/nginx/StaticContentHandler.c

@@ -67,7 +67,8 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
         return NGX_DECLINED;
     }
 
-    #if NGINX_VERSION_NUM < 8038
+    #if (PASSENGER_NGINX_MINOR_VERSION == 8 && PASSENGER_NGINX_MICRO_VERSION < 38) || \
+        (PASSENGER_NGINX_MINOR_VERSION == 7 && PASSENGER_NGINX_MICRO_VERSION < 66)
         if (r->zero_in_uri) {
             return NGX_DECLINED;
         }

data/lib/phusion_passenger/constants.rb

@@ -24,7 +24,7 @@
 module PhusionPassenger
 	# Phusion Passenger version number.
 	# Don't forget to edit ext/common/Version.h too.
-	VERSION_STRING = '2.2.14'
+	VERSION_STRING = '2.2.15'
 	
 	DEFAULT_FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
 	DEFAULT_APP_SPAWNER_MAX_IDLE_TIME       = 10 * 60

data/lib/phusion_passenger/spawn_manager.rb

@@ -79,15 +79,6 @@ class SpawnManager < AbstractServer
 			require 'phusion_passenger/html_template'
 			require 'phusion_passenger/platform_info'
 			require 'phusion_passenger/exceptions'
-			
-			# Commonly used libraries.
-			['mysql', 'sqlite3'].each do |lib|
-				begin
-					require lib
-				rescue LoadError
-					# Do nothing; ignore if not present.
-				end
-			end
 		end
 	end
 	

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 2
-  - 14
-  version: 2.2.14
+  - 15
+  version: 2.2.15
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +02:00
+date: 2010-06-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency