Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I5101c2b1 into eclair-mr2

Browse Source 
* changes:
  Extend the date time to handle the case where the month is in the full name.
This commit is contained in:
Android (Google) Code Review
2009-10-05 14:49:38 -04:00
parent bf13850bed 5101c2b1f1
commit 7fd7534b58
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/HttpDateTime.java
View File

@@ -50,13 +50,15 @@ public final class HttpDateTime {
* Wdy Mon DD HH:MM:SS YYYY GMT * Wdy Mon DD HH:MM:SS YYYY GMT
* *
* HH can be H if the first digit is zero. * HH can be H if the first digit is zero.
*
* Mon can be the full name of the month.
*/ */
private static final String HTTP_DATE_RFC_REGEXP = private static final String HTTP_DATE_RFC_REGEXP =
"([0-9]{1,2})[- ]([A-Za-z]{3,3})[- ]([0-9]{2,4})[ ]" "([0-9]{1,2})[- ]([A-Za-z]{3,9})[- ]([0-9]{2,4})[ ]"
+ "([0-9]{1,2}:[0-9][0-9]:[0-9][0-9])"; + "([0-9]{1,2}:[0-9][0-9]:[0-9][0-9])";
private static final String HTTP_DATE_ANSIC_REGEXP = private static final String HTTP_DATE_ANSIC_REGEXP =
"[ ]([A-Za-z]{3,3})[ ]+([0-9]{1,2})[ ]" "[ ]([A-Za-z]{3,9})[ ]+([0-9]{1,2})[ ]"
+ "([0-9]{1,2}:[0-9][0-9]:[0-9][0-9])[ ]([0-9]{2,4})"; + "([0-9]{1,2}:[0-9][0-9]:[0-9][0-9])[ ]([0-9]{2,4})";
/** /**