diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-05-12 04:06:41 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-05-12 04:06:41 +0000 |
| commit | a61c1825ab84bcef34e9bba0f21b2b4c650373bb (patch) | |
| tree | c6d31d9ca0470cd222d2b3f45031b515a8d0670a | |
| parent | 491b4a3c84194931de51c3331b028dcfcb606074 (diff) | |
| download | rails-a61c1825ab84bcef34e9bba0f21b2b4c650373bb.tar.gz rails-a61c1825ab84bcef34e9bba0f21b2b4c650373bb.tar.bz2 rails-a61c1825ab84bcef34e9bba0f21b2b4c650373bb.zip | |
The app generator detects the XAMPP package's MySQL socket location. Closes #3832.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4336 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index c79e1dcc97..0022be6b60 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* The app generator detects the XAMPP package's MySQL socket location. #3832 [elliot@townx.org] + * The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. #2967 [rcoder, rails-bug@owl.me.uk] * Distinguish the spawners for different processes [DHH] diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 44386f7ac2..6d58b98fbe 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -154,6 +154,7 @@ class AppGenerator < Rails::Generator::Base "/opt/local/lib/mysql/mysql.sock", # fedora "/opt/local/var/run/mysqld/mysqld.sock", # mac + darwinports + mysql "/opt/local/var/run/mysql4/mysqld.sock", # mac + darwinports + mysql4 - "/opt/local/var/run/mysql5/mysqld.sock" # mac + darwinports + mysql5 + "/opt/local/var/run/mysql5/mysqld.sock", # mac + darwinports + mysql5 + "/opt/lampp/var/mysql/mysql.sock" # xampp for linux ] end |