aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2010-04-08 11:26:06 +0000
committerMagnus Hagander <magnus@hagander.net>2010-04-08 11:26:06 +0000
commitf93f91393847260c807aa59b90a7721a57c74e2d (patch)
treec4e4cbd001dfbffadd144129c95e1bcd27d33705
parent547e63680b60f4a6f94b07fac57af7ff9422a67c (diff)
downloadpostgresql-f93f91393847260c807aa59b90a7721a57c74e2d.tar.gz
postgresql-f93f91393847260c807aa59b90a7721a57c74e2d.zip
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
-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 6d0df5dc0cf..f650f463a72 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.63.2.1 2010/04/06 20:35:17 mha Exp $
+ * $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.63.2.2 2010/04/08 11:26:06 mha Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1090,7 +1090,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)
{
@@ -1107,7 +1107,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)
{