kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

matz

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2000-12-22 09:00:23 +00:00
parent 7f16734d27
commit e6bf7809f3
5 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,7 +1,15 @@
Fri Dec 22 15:07:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
Fri Dec 22 17:59:30 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* stable version 1.6.2 released.
Fri Dec 22 17:04:12 2000 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* win32/win32.c (myselect): avoid busy loop by adjusting fd_count.
Fri Dec 22 15:07:55 2000 Yukihiro Matsumoto <matz@ruby-lang.org>
* bignum.c (rb_cstr2inum): prefix like '0x' had removed too much.
Thu Dec 21 13:01:46 2000 Tanaka Akira <akr@m17n.org>
* lib/net/ftp.rb (makeport): don't use TCPsocket.getaddress.

19
bignum.c
View file

@ -202,32 +202,31 @@ rb_cstr2inum(str, base)
while (*str && ISSPACE(*str)) str++;
if (*str == '+') {
if (str[0] == '+') {
str++;
}
else if (*str == '-') {
else if (str[0] == '-') {
str++;
sign = 0;
}
if (base == 0) {
if (*str == '0') {
str++;
if (*str == 'x' || *str == 'X') {
str++;
if (str[0] == '0') {
if (str[1] == 'x' || str[1] == 'X') {
base = 16;
}
else if (*str == 'b' || *str == 'B') {
str++;
else if (str[1] == 'b' || str[1] == 'B') {
base = 2;
}
else {
base = 8;
if (!*str) return INT2FIX(0);
if (!str[1]) return INT2FIX(0);
}
}
else if (str[0] == 0) {
return INT2FIX(0);
}
else {
base = 10;
if (!*str) return INT2FIX(0);
}
}
if (base == 8) {

2
lib/cgi.rb
View file

@ -828,7 +828,7 @@ convert string charset, and set language to "ja".
eval <<-END
def body.original_filename
#{
filename = (Regexp::last_match[1] or "").dup
filename = ($1 or "").dup
if (/Mac/ni === env_table['HTTP_USER_AGENT']) and
(/Mozilla/ni === env_table['HTTP_USER_AGENT']) and
(not /MSIE/ni === env_table['HTTP_USER_AGENT'])

3
win32/Makefile.sub
View file

@ -102,7 +102,7 @@ OBJS = array.obj \
all: miniruby$(EXEEXT) rbconfig.rb ext/extmk.rb \
$(LIBRUBY) $(MISCLIBS)
set LIB=../../win32;$(ORGLIBPATH)
set LIB=../..;$(ORGLIBPATH)
@.\miniruby$(EXEEXT) -Cext extmk.rb
ruby: $(PROGRAM)
@ -195,7 +195,6 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(LIBRUBY_SO).rc: rbconfig.rb
$(CC) $(CFLAGS) -I. -I$(<D) $(CPPFLAGS) -c $(<:/=\)
.c.obj:
$(CC) $(CFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
.rc.res:
$(RC) -I. -I$(<D) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $<

5
win32/win32.c
View file

@ -1974,6 +1974,11 @@ myselect (int nfds, fd_set *rd, fd_set *wr, fd_set *ex,
if (!NtSocketsInitialized++) {
StartSockets();
}
r = 0;
if (rd && rd->fd_count > r) r = rd->fd_count;
if (wr && wr->fd_count > r) r = wr->fd_count;
if (ex && ex->fd_count > r) r = ex->fd_count;
if (nfds > r) nfds = r;
if (nfds == 0 && timeout) {
Sleep(timeout->tv_sec * 1000 + timeout->tv_usec / 1000);
return 0;