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

* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.

Browse source 
[ruby-core:17115]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-06 03:20:36 +00:00
parent 3c964ddb71
commit bff8ab13f3
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Jun 6 12:20:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
[ruby-core:17115]
Fri Jun 6 00:05:33 2008 Tanaka Akira <akr@fsij.org>
* lib/time.rb (Time.xmlschema): don't use float. fix
@ -17,16 +22,6 @@ Thu Jun 5 20:30:46 2008 Akinori MUSHA <knu@iDaemons.org>
workaround for the case where OpenSSL is configured with
--enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
Thu Jun 5 11:01:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
[ruby-core:17115]
Thu Jun 5 11:00:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
[ruby-core:17115]
Wed Jun 4 19:36:45 2008 Akinori MUSHA <knu@iDaemons.org>
* object.c (rb_obj_alloc): RDoc updated. a patch from Gaston

7
ext/iconv/iconv.c
View file

@ -755,7 +755,12 @@ iconv_iconv
if (!NIL_P(str)) slen = RSTRING_LEN(StringValue(str));
if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
if (!NIL_P(n2)) length = NUM2LONG(n2);
if (NIL_P(n2)) {
length = -1;
}
else if ((length = NUM2LONG(n2)) >= slen - start) {
length = slen - start;
}
}
}

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
#define RUBY_RELEASE_DATE "2008-06-04"
#define RUBY_RELEASE_DATE "2008-06-06"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20080604
#define RUBY_RELEASE_CODE 20080606
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 4
#define RUBY_RELEASE_DAY 6
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];