Merge remote branch 'origin/master'

mythz · mythz · commit 6ebd159739bd · 2012-02-28T11:35:22.000-05:00
diff --git a/src/ServiceStack.Text/Common/DateTimeSerializer.cs b/src/ServiceStack.Text/Common/DateTimeSerializer.cs
@@ -142,7 +142,7 @@ public static string ToWcfJsonDate(DateTime dateTime)
 			}
 
 			var timestamp = dateTime.ToUnixTimeMs();
-			var offset = dateTime.Kind == DateTimeKind.Utc
+			var offset = dateTime.Kind == DateTimeKind.Utc || dateTime.Kind == DateTimeKind.Unspecified
 							? string.Empty
 							: TimeZoneInfo.Local.GetUtcOffset(dateTime).ToTimeOffsetString();
 			return EscapedWcfJsonPrefix + timestamp + offset + EscapedWcfJsonSuffix;

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public static string ToWcfJsonDate(DateTime dateTime)`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`var timestamp = dateTime.ToUnixTimeMs();`
`145`		`- var offset = dateTime.Kind == DateTimeKind.Utc`
	`145`	`+ var offset = dateTime.Kind == DateTimeKind.Utc \|\| dateTime.Kind == DateTimeKind.Unspecified`
`146`	`146`	`? string.Empty`
`147`	`147`	`: TimeZoneInfo.Local.GetUtcOffset(dateTime).ToTimeOffsetString();`
`148`	`148`	`return EscapedWcfJsonPrefix + timestamp + offset + EscapedWcfJsonSuffix;`