diff --git a/ruby-1.8.7.p299_webrick_error_page_encoding.patch b/ruby-1.8.7.p299_webrick_error_page_encoding.patch deleted file mode 100644 index d340be7..0000000 --- a/ruby-1.8.7.p299_webrick_error_page_encoding.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/webrick/httpresponse.rb -=================================================================== ---- lib/webrick/httpresponse.rb.orig 2008-06-06 10:05:24.000000000 +0200 -+++ lib/webrick/httpresponse.rb 2010-07-01 17:58:35.585190988 +0200 -@@ -209,7 +209,7 @@ module WEBrick - @keep_alive = false - self.status = HTTPStatus::RC_INTERNAL_SERVER_ERROR - end -- @header['content-type'] = "text/html" -+ @header['content-type'] = "text/html; charset=utf-8" - - if respond_to?(:create_error_page) - create_error_page() diff --git a/ruby.spec b/ruby.spec index 33a9bf9..6c9f706 100644 --- a/ruby.spec +++ b/ruby.spec @@ -69,9 +69,7 @@ Patch10: ruby-1.8.x_openssl_branch_update.patch Patch11: ruby-1.8.x_yaml2byte.patch Patch12: 1887f60a8540f64f5c7bb14d57c0be70506941b8.patch Patch13: ruby-1.8.7.p334_remove_zlib_test_params_test.patch -# need to discuss with sec team which encoding is better -Patch14: ruby-1.8.7.p299_webrick_error_page_encoding.patch -Patch15: ruby-1.8.x_rubylibdir.patch +Patch14: ruby-1.8.x_rubylibdir.patch # vendor ruby files taken from: # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/ Source3: site-specific.rb @@ -252,7 +250,7 @@ Authors: %patch11 %patch12 %patch13 -%patch15 +%patch14 %if 0%{?with_bleak_house} for patch in valgrind configure gc ; do patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch