summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-07 01:01:22 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-10-07 01:01:22 +0000
commitaefba51a4a7150ceef492afdcb76fa959bdc11bb (patch)
tree4dd3830c022fd42e56b22bf3ff07ef1ed0314f17
parente4014b69954a840fbee09a7e37b8e7806aff4e9d (diff)
* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
not be parsed correctly. A patch from August Z. Flatby (augustzf) in [ruby-Patches-2595]. [ruby-core:06183] * pack.c (EXTEND16): [ruby-dev:27383] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--lib/cgi.rb2
-rw-r--r--pack.c4
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0714cceead..5fdac2cc39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 7 09:54:00 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
+ not be parsed correctly. A patch from August Z. Flatby
+ (augustzf) in [ruby-Patches-2595]. [ruby-core:06183]
+
Thu Oct 6 20:12:16 2005 Minero Aoki <aamine@loveruby.net>
* ext/strscan/strscan.c (strscan_free): remove useless code.
@@ -14,6 +20,10 @@ Wed Oct 05 03:59:09 2005 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
of "join".
+Mon Oct 3 00:04:00 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * pack.c (EXTEND16): [ruby-dev:27383]
+
Thu Sep 29 10:26:18 2005 Tanaka Akira <akr@m17n.org>
* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
@@ -43,6 +53,7 @@ Wed Sep 28 23:42:15 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
undocumented.
+>>>>>>> 1.2673.2.1315
Wed Sep 28 23:09:23 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/delegate.rb: document update from James Edward Gray II
diff --git a/lib/cgi.rb b/lib/cgi.rb
index b18a03524c..2d75ac2488 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -870,7 +870,7 @@ class CGI
cookies = Hash.new([])
return cookies unless raw_cookie
- raw_cookie.split(/[;,] /).each do |pairs|
+ raw_cookie.split(/[;,]\s?/).each do |pairs|
name, values = pairs.split('=',2)
next unless name and values
name = CGI::unescape(name)
diff --git a/pack.c b/pack.c
index a5524bcca0..67daa6838f 100644
--- a/pack.c
+++ b/pack.c
@@ -351,12 +351,12 @@ num2i32(x)
# define EXTEND32(x)
#else
/* invariant in modulo 1<<31 */
-# define EXTEND32(x) do {if (!natint) {(x) = (I32)(((1<<31)-1-(x))^~(~0<<31))}} while(0)
+# define EXTEND32(x) do {if (!natint) {(x) = (I32)(((1<<31)-1-(x))^~(~0<<31));}} while(0)
#endif
#if SIZEOF_SHORT == SIZE16
# define EXTEND16(x)
#else
-# define EXTEND16(x) do { if (!natint) {(x) = (short)(((1<<15)-1-(x))^~(~0<<15))}} while(0)
+# define EXTEND16(x) do { if (!natint) {(x) = (short)(((1<<15)-1-(x))^~(~0<<15));}} while(0)
#endif
#ifdef HAVE_LONG_LONG