diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-13 05:09:11 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-02-13 05:09:11 +0000 |
| commit | 73e5f4bc9c528f24bd1230f82a7d12b8e2f8a11d (patch) | |
| tree | 8946eb2e9437f998c332d5d7326032efce9dd141 /lib | |
| parent | 0b320355a82b8a681ffe33bc4fe4ee21291e1726 (diff) | |
| download | ruby-73e5f4bc9c528f24bd1230f82a7d12b8e2f8a11d.tar.gz ruby-73e5f4bc9c528f24bd1230f82a7d12b8e2f8a11d.tar.xz ruby-73e5f4bc9c528f24bd1230f82a7d12b8e2f8a11d.zip | |
* io.c (rb_io_ctl): do not call ioctl/fcntl for f2, if f and f2
have same fileno.
* eval.c (rb_load): raise LocaJumpError if unexpected local jumps
appear during load.
* ext/socket/socket.c (bsock_close_read): don't call rb_thread_fd_close();
it's supposed to be called by io_io_close().
* ext/socket/socket.c (bsock_close_read): do not modify f and f2.
* ext/socket/socket.c (bsock_close_write): ditto.
* ext/socket/socket.c (sock_new): avoid dup(2) on sockets.
* parse.y (primary): preserve and clear in_single and in_def using
stack to prevent nested method errors in singleton class bodies.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cgi/session.rb | 1 | ||||
| -rw-r--r-- | lib/importenv.rb | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb index 8c4417c49..d7915c84d 100644 --- a/lib/cgi/session.rb +++ b/lib/cgi/session.rb @@ -25,7 +25,6 @@ class CGI md5.update('foobar') md5.hexdigest[0,16] end - private :create_new_id def initialize(request, option={}) session_key = option['session_key'] || '_session_id' diff --git a/lib/importenv.rb b/lib/importenv.rb index abf1c306e..586f37661 100644 --- a/lib/importenv.rb +++ b/lib/importenv.rb @@ -9,9 +9,8 @@ for k,v in ENV next unless /^[a-zA-Z][_a-zA-Z0-9]*/ =~ k - v = v.gsub(/\\/) {|s| '\\'+s} eval <<EOS - $#{k} = %q\0#{v}\0 + $#{k} = v trace_var "$#{k}", proc{|v| ENV[%q!#{k}!] = v $#{k} = v |