--- locale.inc.orig	2011-06-01 17:43:30.000000000 -0700
+++ locale.inc	2011-06-01 17:31:41.000000000 -0700
@@ -209,7 +209,7 @@ function locale_language_from_url($langu
     case LOCALE_LANGUAGE_NEGOTIATION_URL_DOMAIN:
       foreach ($languages as $language) {
         $host = parse_url($language->domain, PHP_URL_HOST);
-        if ($host && ($_SERVER['HTTP_HOST'] == $host)) {
+        if ($host && (parse_url($_SERVER['HTTP_HOST'], PHP_URL_HOST) == $host)) {
           $language_url = $language->language;
           break;
         }