diff options
author | Micael Karlberg <[email protected]> | 2011-09-23 13:59:36 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-09-23 13:59:36 +0200 |
commit | 12f3b441fc138a6e7a5bc09b8973bd55cba8b5be (patch) | |
tree | e11842c24a67865db211fd90030f2594ea85035a /lib/inets/src/http_lib/http_util.erl | |
parent | 9afeecb840b9b225e28597f78e9efe632f6b41b8 (diff) | |
parent | 368449d2316b0f0f7c0dce55a9dd47c3acadb76d (diff) | |
download | otp-12f3b441fc138a6e7a5bc09b8973bd55cba8b5be.tar.gz otp-12f3b441fc138a6e7a5bc09b8973bd55cba8b5be.tar.bz2 otp-12f3b441fc138a6e7a5bc09b8973bd55cba8b5be.zip |
[httpc] Parsing of a cookie expire date should be more forgiving.
That is, if the parsing fails, the date should be ignored.
Also added support for (yet another) date format:
"Tue Jan 01 08:00:01 2036 GMT".
OTP-9433
[httpc] Rewrote cookie parsing. Among other things solving
cookie processing from www.expedia.com.
OTP-9434
[httpd] Fix httpd directory traversal on Windows.
Directory traversal was possible on Windows where
backward slash is used as directory separator.
Andr�s Veres-Szentkir�lyi.
OTP-9561
Merge branch 'bmk/inets/inets571_integration' into dev
Diffstat (limited to 'lib/inets/src/http_lib/http_util.erl')
-rw-r--r-- | lib/inets/src/http_lib/http_util.erl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/inets/src/http_lib/http_util.erl b/lib/inets/src/http_lib/http_util.erl index 5511ed388d..973600d7be 100644 --- a/lib/inets/src/http_lib/http_util.erl +++ b/lib/inets/src/http_lib/http_util.erl @@ -104,6 +104,22 @@ convert_netscapecookie_date([_D,_A,_Y, $ , Sec = list_to_integer([S1,S2]), {{Year,Month,Day},{Hour,Min,Sec}}; +%% Example: Tue Jan 01 08:00:01 2036 GMT +convert_netscapecookie_date([_D,_A,_Y, $ , + M,O,N, $ , + D1,D2, $ , + H1,H2, $:, + M1,M2, $:, + S1,S2, $ , + Y1,Y2,Y3,Y4, $ |_Rest]) -> + Year = list_to_integer([Y1,Y2,Y3,Y4]), + Day = list_to_integer([D1,D2]), + Month = convert_month([M,O,N]), + Hour = list_to_integer([H1,H2]), + Min = list_to_integer([M1,M2]), + Sec = list_to_integer([S1,S2]), + {{Year,Month,Day},{Hour,Min,Sec}}; + %% Sloppy... convert_netscapecookie_date([_D,_A,_Y, $,, _SP, D1,D2,_DA, |