summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2010-04-08 11:26:03 +0000
committerMagnus Hagander <magnus@hagander.net>2010-04-08 11:26:03 +0000
commit34baf4b3d3258f1058a189e0b226507277f64138 (patch)
tree6a30680268edf493bc9f681e0ab5be0e5193a0f9 /src
parent0ae9a9d25f9081aa2339448293926630621963a2 (diff)
Proceed to look for the next timezone when matching a localized
Windows timezone name where the information in the registry is incomplete, instead of aborting. This fixes cases when the registry information is incomplete for a timezone that is alphabetically before the one that is in use. Per report from Alexander Forschner
Diffstat (limited to 'src')
-rw-r--r--src/timezone/pgtz.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index 83f3b727c76..a87f674f29a 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.58.2.2 2010/04/06 20:35:15 mha Exp $
+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.58.2.3 2010/04/08 11:26:03 mha Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1089,7 +1089,7 @@ identify_system_timezone(void)
(errmsg_internal("could not query value for 'std' to identify Windows timezone \"%s\": %i",
keyname, (int) r)));
RegCloseKey(key);
- break;
+ continue; /* Proceed to look at the next timezone */
}
if (strcmp(tzname, zonename) == 0)
{
@@ -1106,7 +1106,7 @@ identify_system_timezone(void)
(errmsg_internal("could not query value for 'dlt' to identify Windows timezone \"%s\": %i",
keyname, (int) r)));
RegCloseKey(key);
- break;
+ continue; /* Proceed to look at the next timezone */
}
if (strcmp(tzname, zonename) == 0)
{