[interchange-cvs] [SCM] Interchange branch, master, updated. 1a6c18d8daf8bbf45c22101e5f71721fa978a991
Gert van der Spoel
interchange-cvs at icdevgroup.org
Fri Jul 10 07:50:00 UTC 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".
The branch, master has been updated
via 1a6c18d8daf8bbf45c22101e5f71721fa978a991 (commit)
via 8964c3a2520343f8119918e2b52952cda38ab9e4 (commit)
from c96b7df1bb33979732cebd25b839828cfd89893a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1a6c18d8daf8bbf45c22101e5f71721fa978a991
Author: Gert van der Spoel <ic at 3edge.com>
Date: Fri Jul 10 09:42:09 2009 +0200
If MINIVEND_DISABLE_UTF8 skip validation of MV_HTTP_CHARSET
When MINIVEND_DISABLE_UTF8 was set and you tried to set MV_HTTP_CHARSET
the catalog would not start with the error:
Undefined subroutine &Vend::CharSet::find_encoding called at ...
As MINIVEND_DISABLE_UTF8 is pretty much in place to avoid using Encode,
you'd still want to be able to set MV_HTTP_CHARSET to override the
default $response_charset in lib/Vend/Server.pm ...
So it will now skip charset validation when MINIVEND_DISABLE_UTF8 is 1.
commit 8964c3a2520343f8119918e2b52952cda38ab9e4
Author: Gert van der Spoel <ic at 3edge.com>
Date: Fri Jul 10 09:40:27 2009 +0200
Put http_x_forwarded_for in correct alphabetic place
-----------------------------------------------------------------------
Summary of changes and diff:
lib/Vend/Config.pm | 3 ++-
lib/Vend/Server.pm | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/Vend/Config.pm b/lib/Vend/Config.pm
index 48998e9..8fcef7b 100644
--- a/lib/Vend/Config.pm
+++ b/lib/Vend/Config.pm
@@ -3666,7 +3666,8 @@ sub set_defaults {
}
# check MV_HTTP_CHARSET against a valid encoding
- if (my $enc = $C->{Variable}->{MV_HTTP_CHARSET}) {
+ if ( !$ENV{MINIVEND_DISABLE_UTF8} &&
+ (my $enc = $C->{Variable}->{MV_HTTP_CHARSET}) ) {
if (my $norm_enc = Vend::CharSet::validate_encoding($enc)) {
if ($norm_enc ne $enc) {
config_warn("Provided MV_HTTP_CHARSET '$enc' resolved to '$norm_enc'. Continuing.");
diff --git a/lib/Vend/Server.pm b/lib/Vend/Server.pm
index 62e1759..60fb7e6 100644
--- a/lib/Vend/Server.pm
+++ b/lib/Vend/Server.pm
@@ -67,6 +67,7 @@ my @Map = qw/
content_encoding HTTP_CONTENT_ENCODING
cookie HTTP_COOKIE
http_host HTTP_HOST
+ http_x_forwarded_for HTTP_X_FORWARDED_FOR
path_info PATH_INFO
pragma HTTP_PRAGMA
query_string QUERY_STRING
@@ -82,8 +83,6 @@ my @Map = qw/
server_host HTTP_HOST
server_port SERVER_PORT
useragent HTTP_USER_AGENT
- http_x_forwarded_for HTTP_X_FORWARDED_FOR
-
/;
hooks/post-receive
--
Interchange
More information about the interchange-cvs
mailing list