From 84081b4508c51d04a4a9019fcffe0e034b0b2d39 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 8 Sep 2009 15:10:04 -0700
Subject: "encoding: binary" comments for all sources (1.9)

This ensures any string literals that pop up in *our* code will
just be a bag of bytes.  This shouldn't affect/fix/break
existing apps in most cases, but most constants will always have
the "correct" encoding (none!) to be consistent with HTTP/socket
expectations.  Since this comment affects things only on a
per-source basis, it won't affect existing apps with the
exception of strings we pass to the Rack application.

This will eventually allow us to get rid of that Unicorn::Z
constant, too.
---
 test/rails/app-1.2.3/app/controllers/application.rb              | 2 ++
 test/rails/app-1.2.3/app/controllers/foo_controller.rb           | 2 ++
 test/rails/app-1.2.3/app/helpers/application_helper.rb           | 2 ++
 test/rails/app-1.2.3/config/boot.rb                              | 2 ++
 test/rails/app-1.2.3/config/environment.rb                       | 2 ++
 test/rails/app-1.2.3/config/environments/development.rb          | 2 ++
 test/rails/app-1.2.3/config/environments/production.rb           | 2 ++
 test/rails/app-1.2.3/config/routes.rb                            | 2 ++
 test/rails/app-2.0.2/app/controllers/application.rb              | 2 ++
 test/rails/app-2.0.2/app/controllers/foo_controller.rb           | 2 ++
 test/rails/app-2.0.2/app/helpers/application_helper.rb           | 2 ++
 test/rails/app-2.0.2/config/boot.rb                              | 2 ++
 test/rails/app-2.0.2/config/environment.rb                       | 2 ++
 test/rails/app-2.0.2/config/environments/development.rb          | 2 ++
 test/rails/app-2.0.2/config/environments/production.rb           | 2 ++
 test/rails/app-2.0.2/config/routes.rb                            | 2 ++
 test/rails/app-2.1.2/app/controllers/application.rb              | 2 ++
 test/rails/app-2.1.2/app/controllers/foo_controller.rb           | 2 ++
 test/rails/app-2.1.2/app/helpers/application_helper.rb           | 2 ++
 test/rails/app-2.1.2/config/boot.rb                              | 2 ++
 test/rails/app-2.1.2/config/environment.rb                       | 2 ++
 test/rails/app-2.1.2/config/environments/development.rb          | 2 ++
 test/rails/app-2.1.2/config/environments/production.rb           | 2 ++
 test/rails/app-2.1.2/config/routes.rb                            | 2 ++
 test/rails/app-2.2.2/app/controllers/application.rb              | 2 ++
 test/rails/app-2.2.2/app/controllers/foo_controller.rb           | 2 ++
 test/rails/app-2.2.2/app/helpers/application_helper.rb           | 2 ++
 test/rails/app-2.2.2/config/boot.rb                              | 2 ++
 test/rails/app-2.2.2/config/environment.rb                       | 2 ++
 test/rails/app-2.2.2/config/environments/development.rb          | 2 ++
 test/rails/app-2.2.2/config/environments/production.rb           | 2 ++
 test/rails/app-2.2.2/config/routes.rb                            | 2 ++
 test/rails/app-2.3.3.1/app/controllers/application_controller.rb | 2 ++
 test/rails/app-2.3.3.1/app/controllers/foo_controller.rb         | 2 ++
 test/rails/app-2.3.3.1/app/helpers/application_helper.rb         | 2 ++
 test/rails/app-2.3.3.1/config/boot.rb                            | 2 ++
 test/rails/app-2.3.3.1/config/environment.rb                     | 2 ++
 test/rails/app-2.3.3.1/config/environments/development.rb        | 2 ++
 test/rails/app-2.3.3.1/config/environments/production.rb         | 2 ++
 test/rails/app-2.3.3.1/config/routes.rb                          | 2 ++
 test/rails/test_rails.rb                                         | 2 ++
 41 files changed, 82 insertions(+)

(limited to 'test/rails')

diff --git a/test/rails/app-1.2.3/app/controllers/application.rb b/test/rails/app-1.2.3/app/controllers/application.rb
index ae8cac0..e72474f 100644
--- a/test/rails/app-1.2.3/app/controllers/application.rb
+++ b/test/rails/app-1.2.3/app/controllers/application.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 class ApplicationController < ActionController::Base
   # Pick a unique cookie name to distinguish our session data from others'
   session :session_key => "_unicorn_rails_test.#{rand}"
diff --git a/test/rails/app-1.2.3/app/controllers/foo_controller.rb b/test/rails/app-1.2.3/app/controllers/foo_controller.rb
index 8d877d1..52b7947 100644
--- a/test/rails/app-1.2.3/app/controllers/foo_controller.rb
+++ b/test/rails/app-1.2.3/app/controllers/foo_controller.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'digest/sha1'
 class FooController < ApplicationController
   def index
diff --git a/test/rails/app-1.2.3/app/helpers/application_helper.rb b/test/rails/app-1.2.3/app/helpers/application_helper.rb
index de6be79..d9889b3 100644
--- a/test/rails/app-1.2.3/app/helpers/application_helper.rb
+++ b/test/rails/app-1.2.3/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 module ApplicationHelper
 end
diff --git a/test/rails/app-1.2.3/config/boot.rb b/test/rails/app-1.2.3/config/boot.rb
index 71c7d7c..84a5c18 100644
--- a/test/rails/app-1.2.3/config/boot.rb
+++ b/test/rails/app-1.2.3/config/boot.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
   RAILS_ROOT = root_path
diff --git a/test/rails/app-1.2.3/config/environment.rb b/test/rails/app-1.2.3/config/environment.rb
index 2ef6b4a..e230a66 100644
--- a/test/rails/app-1.2.3/config/environment.rb
+++ b/test/rails/app-1.2.3/config/environment.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined? RAILS_GEM_VERSION
   RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION'] # || '1.2.3'
 end
diff --git a/test/rails/app-1.2.3/config/environments/development.rb b/test/rails/app-1.2.3/config/environments/development.rb
index 032fb46..9d78f5e 100644
--- a/test/rails/app-1.2.3/config/environments/development.rb
+++ b/test/rails/app-1.2.3/config/environments/development.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = false
 config.whiny_nils = true
 config.breakpoint_server = true
diff --git a/test/rails/app-1.2.3/config/environments/production.rb b/test/rails/app-1.2.3/config/environments/production.rb
index c4059e3..1e049b2 100644
--- a/test/rails/app-1.2.3/config/environments/production.rb
+++ b/test/rails/app-1.2.3/config/environments/production.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = true
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
diff --git a/test/rails/app-1.2.3/config/routes.rb b/test/rails/app-1.2.3/config/routes.rb
index 774028f..70816dc 100644
--- a/test/rails/app-1.2.3/config/routes.rb
+++ b/test/rails/app-1.2.3/config/routes.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
diff --git a/test/rails/app-2.0.2/app/controllers/application.rb b/test/rails/app-2.0.2/app/controllers/application.rb
index 09705d1..e7bb740 100644
--- a/test/rails/app-2.0.2/app/controllers/application.rb
+++ b/test/rails/app-2.0.2/app/controllers/application.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 class ApplicationController < ActionController::Base
 end
diff --git a/test/rails/app-2.0.2/app/controllers/foo_controller.rb b/test/rails/app-2.0.2/app/controllers/foo_controller.rb
index 8d877d1..52b7947 100644
--- a/test/rails/app-2.0.2/app/controllers/foo_controller.rb
+++ b/test/rails/app-2.0.2/app/controllers/foo_controller.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'digest/sha1'
 class FooController < ApplicationController
   def index
diff --git a/test/rails/app-2.0.2/app/helpers/application_helper.rb b/test/rails/app-2.0.2/app/helpers/application_helper.rb
index de6be79..d9889b3 100644
--- a/test/rails/app-2.0.2/app/helpers/application_helper.rb
+++ b/test/rails/app-2.0.2/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 module ApplicationHelper
 end
diff --git a/test/rails/app-2.0.2/config/boot.rb b/test/rails/app-2.0.2/config/boot.rb
index 71c7d7c..84a5c18 100644
--- a/test/rails/app-2.0.2/config/boot.rb
+++ b/test/rails/app-2.0.2/config/boot.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
   RAILS_ROOT = root_path
diff --git a/test/rails/app-2.0.2/config/environment.rb b/test/rails/app-2.0.2/config/environment.rb
index 7c720f6..9961f08 100644
--- a/test/rails/app-2.0.2/config/environment.rb
+++ b/test/rails/app-2.0.2/config/environment.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined? RAILS_GEM_VERSION
   RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION']
 end
diff --git a/test/rails/app-2.0.2/config/environments/development.rb b/test/rails/app-2.0.2/config/environments/development.rb
index 6a613c1..5e0f1ca 100644
--- a/test/rails/app-2.0.2/config/environments/development.rb
+++ b/test/rails/app-2.0.2/config/environments/development.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = false
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
diff --git a/test/rails/app-2.0.2/config/environments/production.rb b/test/rails/app-2.0.2/config/environments/production.rb
index c4059e3..1e049b2 100644
--- a/test/rails/app-2.0.2/config/environments/production.rb
+++ b/test/rails/app-2.0.2/config/environments/production.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = true
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
diff --git a/test/rails/app-2.0.2/config/routes.rb b/test/rails/app-2.0.2/config/routes.rb
index 774028f..70816dc 100644
--- a/test/rails/app-2.0.2/config/routes.rb
+++ b/test/rails/app-2.0.2/config/routes.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
diff --git a/test/rails/app-2.1.2/app/controllers/application.rb b/test/rails/app-2.1.2/app/controllers/application.rb
index 09705d1..e7bb740 100644
--- a/test/rails/app-2.1.2/app/controllers/application.rb
+++ b/test/rails/app-2.1.2/app/controllers/application.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 class ApplicationController < ActionController::Base
 end
diff --git a/test/rails/app-2.1.2/app/controllers/foo_controller.rb b/test/rails/app-2.1.2/app/controllers/foo_controller.rb
index 8d877d1..52b7947 100644
--- a/test/rails/app-2.1.2/app/controllers/foo_controller.rb
+++ b/test/rails/app-2.1.2/app/controllers/foo_controller.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'digest/sha1'
 class FooController < ApplicationController
   def index
diff --git a/test/rails/app-2.1.2/app/helpers/application_helper.rb b/test/rails/app-2.1.2/app/helpers/application_helper.rb
index de6be79..d9889b3 100644
--- a/test/rails/app-2.1.2/app/helpers/application_helper.rb
+++ b/test/rails/app-2.1.2/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 module ApplicationHelper
 end
diff --git a/test/rails/app-2.1.2/config/boot.rb b/test/rails/app-2.1.2/config/boot.rb
index 0a51688..e357f0a 100644
--- a/test/rails/app-2.1.2/config/boot.rb
+++ b/test/rails/app-2.1.2/config/boot.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
diff --git a/test/rails/app-2.1.2/config/environment.rb b/test/rails/app-2.1.2/config/environment.rb
index 7c720f6..9961f08 100644
--- a/test/rails/app-2.1.2/config/environment.rb
+++ b/test/rails/app-2.1.2/config/environment.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined? RAILS_GEM_VERSION
   RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION']
 end
diff --git a/test/rails/app-2.1.2/config/environments/development.rb b/test/rails/app-2.1.2/config/environments/development.rb
index 7f49032..37f523f 100644
--- a/test/rails/app-2.1.2/config/environments/development.rb
+++ b/test/rails/app-2.1.2/config/environments/development.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = false
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
diff --git a/test/rails/app-2.1.2/config/environments/production.rb b/test/rails/app-2.1.2/config/environments/production.rb
index c4059e3..1e049b2 100644
--- a/test/rails/app-2.1.2/config/environments/production.rb
+++ b/test/rails/app-2.1.2/config/environments/production.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = true
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
diff --git a/test/rails/app-2.1.2/config/routes.rb b/test/rails/app-2.1.2/config/routes.rb
index 774028f..70816dc 100644
--- a/test/rails/app-2.1.2/config/routes.rb
+++ b/test/rails/app-2.1.2/config/routes.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
diff --git a/test/rails/app-2.2.2/app/controllers/application.rb b/test/rails/app-2.2.2/app/controllers/application.rb
index 09705d1..e7bb740 100644
--- a/test/rails/app-2.2.2/app/controllers/application.rb
+++ b/test/rails/app-2.2.2/app/controllers/application.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 class ApplicationController < ActionController::Base
 end
diff --git a/test/rails/app-2.2.2/app/controllers/foo_controller.rb b/test/rails/app-2.2.2/app/controllers/foo_controller.rb
index 8d877d1..52b7947 100644
--- a/test/rails/app-2.2.2/app/controllers/foo_controller.rb
+++ b/test/rails/app-2.2.2/app/controllers/foo_controller.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'digest/sha1'
 class FooController < ApplicationController
   def index
diff --git a/test/rails/app-2.2.2/app/helpers/application_helper.rb b/test/rails/app-2.2.2/app/helpers/application_helper.rb
index de6be79..d9889b3 100644
--- a/test/rails/app-2.2.2/app/helpers/application_helper.rb
+++ b/test/rails/app-2.2.2/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 module ApplicationHelper
 end
diff --git a/test/rails/app-2.2.2/config/boot.rb b/test/rails/app-2.2.2/config/boot.rb
index 0a51688..e357f0a 100644
--- a/test/rails/app-2.2.2/config/boot.rb
+++ b/test/rails/app-2.2.2/config/boot.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 # Don't change this file!
 # Configure your app in config/environment.rb and config/environments/*.rb
 
diff --git a/test/rails/app-2.2.2/config/environment.rb b/test/rails/app-2.2.2/config/environment.rb
index 7c720f6..9961f08 100644
--- a/test/rails/app-2.2.2/config/environment.rb
+++ b/test/rails/app-2.2.2/config/environment.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined? RAILS_GEM_VERSION
   RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION']
 end
diff --git a/test/rails/app-2.2.2/config/environments/development.rb b/test/rails/app-2.2.2/config/environments/development.rb
index 7f49032..37f523f 100644
--- a/test/rails/app-2.2.2/config/environments/development.rb
+++ b/test/rails/app-2.2.2/config/environments/development.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = false
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
diff --git a/test/rails/app-2.2.2/config/environments/production.rb b/test/rails/app-2.2.2/config/environments/production.rb
index c4059e3..1e049b2 100644
--- a/test/rails/app-2.2.2/config/environments/production.rb
+++ b/test/rails/app-2.2.2/config/environments/production.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = true
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
diff --git a/test/rails/app-2.2.2/config/routes.rb b/test/rails/app-2.2.2/config/routes.rb
index 774028f..70816dc 100644
--- a/test/rails/app-2.2.2/config/routes.rb
+++ b/test/rails/app-2.2.2/config/routes.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
diff --git a/test/rails/app-2.3.3.1/app/controllers/application_controller.rb b/test/rails/app-2.3.3.1/app/controllers/application_controller.rb
index 6160f52..07c333e 100644
--- a/test/rails/app-2.3.3.1/app/controllers/application_controller.rb
+++ b/test/rails/app-2.3.3.1/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 class ApplicationController < ActionController::Base
   helper :all
 end
diff --git a/test/rails/app-2.3.3.1/app/controllers/foo_controller.rb b/test/rails/app-2.3.3.1/app/controllers/foo_controller.rb
index 261669c..54ca1ed 100644
--- a/test/rails/app-2.3.3.1/app/controllers/foo_controller.rb
+++ b/test/rails/app-2.3.3.1/app/controllers/foo_controller.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 require 'digest/sha1'
 class FooController < ApplicationController
   def index
diff --git a/test/rails/app-2.3.3.1/app/helpers/application_helper.rb b/test/rails/app-2.3.3.1/app/helpers/application_helper.rb
index de6be79..d9889b3 100644
--- a/test/rails/app-2.3.3.1/app/helpers/application_helper.rb
+++ b/test/rails/app-2.3.3.1/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
+# -*- encoding: binary -*-
+
 module ApplicationHelper
 end
diff --git a/test/rails/app-2.3.3.1/config/boot.rb b/test/rails/app-2.3.3.1/config/boot.rb
index d22e6b0..b6c80d5 100644
--- a/test/rails/app-2.3.3.1/config/boot.rb
+++ b/test/rails/app-2.3.3.1/config/boot.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 
 module Rails
diff --git a/test/rails/app-2.3.3.1/config/environment.rb b/test/rails/app-2.3.3.1/config/environment.rb
index 17abdb7..6eb092c 100644
--- a/test/rails/app-2.3.3.1/config/environment.rb
+++ b/test/rails/app-2.3.3.1/config/environment.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 unless defined? RAILS_GEM_VERSION
   RAILS_GEM_VERSION = ENV['UNICORN_RAILS_VERSION']
 end
diff --git a/test/rails/app-2.3.3.1/config/environments/development.rb b/test/rails/app-2.3.3.1/config/environments/development.rb
index 55376c5..3d381d2 100644
--- a/test/rails/app-2.3.3.1/config/environments/development.rb
+++ b/test/rails/app-2.3.3.1/config/environments/development.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = false
 config.whiny_nils = true
 config.action_controller.consider_all_requests_local = true
diff --git a/test/rails/app-2.3.3.1/config/environments/production.rb b/test/rails/app-2.3.3.1/config/environments/production.rb
index 474257d..08710a4 100644
--- a/test/rails/app-2.3.3.1/config/environments/production.rb
+++ b/test/rails/app-2.3.3.1/config/environments/production.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 config.cache_classes = true
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
diff --git a/test/rails/app-2.3.3.1/config/routes.rb b/test/rails/app-2.3.3.1/config/routes.rb
index 4248853..ac7877c 100644
--- a/test/rails/app-2.3.3.1/config/routes.rb
+++ b/test/rails/app-2.3.3.1/config/routes.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 ActionController::Routing::Routes.draw do |map|
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
diff --git a/test/rails/test_rails.rb b/test/rails/test_rails.rb
index e6f6a36..8ff97f6 100644
--- a/test/rails/test_rails.rb
+++ b/test/rails/test_rails.rb
@@ -1,3 +1,5 @@
+# -*- encoding: binary -*-
+
 # Copyright (c) 2009 Eric Wong
 require 'test/test_helper'
 
-- 
cgit v1.2.3-24-ge0c7