Permalink
Browse files

Fix some Ruby 1.9-specific crashes caused by encoding issues. Bug #364.

  • Loading branch information...
1 parent 7fc65f2 commit ac777e522539f35d2edcd561e5c784ba832c4160 @FooBarWidget FooBarWidget committed Aug 27, 2009
View
1 NEWS
@@ -116,6 +116,7 @@ Release 2.2.5
PATH_INFO is supposed to be set to the request URI, but without the query
string and without the base URI. This has been fixed: bug #360.
+ * Fixed some Ruby 1.9-specific crashes caused by encoding issues. Bug #354.
* The Users Guide for Apache now mentions something about correct permissions
for application directories.
* Fixed compilation problems on IA-64 (bug #118). We also reduced the stack
@@ -1,3 +1,4 @@
+# encoding: binary
# Phusion Passenger - http://www.modrails.com/
# Copyright (c) 2008, 2009 Phusion
#
@@ -404,9 +405,8 @@ def client.sync=(value)
undef rewind if respond_to?(:rewind)
end
- # Set encoding for Ruby 1.9 compatibility.
- client.set_encoding(Encoding::BINARY) if client.respond_to?(:set_encoding)
- client.binmode
+ # There's no need to set the encoding for Ruby 1.9 because this
+ # source file is tagged with 'encoding: binary'.
return client
else
@@ -1,3 +1,4 @@
+# encoding: binary
# Phusion Passenger - http://www.modrails.com/
# Copyright (c) 2008, 2009 Phusion
#
@@ -1,3 +1,4 @@
+# encoding: binary
# Phusion Passenger - http://www.modrails.com/
# Copyright (c) 2008, 2009 Phusion
#
@@ -1,3 +1,4 @@
+# encoding: binary
# Phusion Passenger - http://www.modrails.com/
# Copyright (c) 2008, 2009 Phusion
#
@@ -1,3 +1,4 @@
+# encoding: binary
# Phusion Passenger - http://www.modrails.com/
# Copyright (c) 2008, 2009 Phusion
#
@@ -1,3 +1,4 @@
+# encoding: binary
# Phusion Passenger - http://www.modrails.com/
# Copyright (c) 2008, 2009 Phusion
#
@@ -1,3 +1,4 @@
+# encoding: binary
# Phusion Passenger - http://www.modrails.com/
# Copyright (c) 2008, 2009 Phusion
#

0 comments on commit ac777e5

Please sign in to comment.