Commit graph

8526 commits

Author SHA1 Message Date
naruse
f48ae0d10c merge revision(s) 44717:
* configure.in: define USE_BUILTIN_FRAME_ADDRESS on x86_64
	  even if __builtin_frame_address is not used now.
	  By this, FreeBSD's clang can build ruby 1.8,
	  and alloca(1) doesn't work on it.


git-svn-id: svn+ssh://svn.ruby-lang.org/ruby/branches/ruby_1_8_7@44719 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-01-27 18:59:34 +00:00
svn
b912e1d2c0 * 2013-12-23
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@44352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-22 23:31:10 +00:00
hone
dabc90361d merge revision(s) 43775: [Fixes GH-457]
https://github.com/ruby/ruby/pull/457

    * util.c (ruby_strtod): ignore too long fraction part, which does not
      affect the result.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@44351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-22 23:31:03 +00:00
shyouhei
469d4b9389 Oops, sorry!
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@41678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-27 11:56:26 +00:00
shyouhei
961bf7496d * ext/openssl/lib/openssl/ssl-internal.rb (OpenSSL::SSL#verify_certificate_identity):
fix hostname verification. Patch by nahi.

	* test/openssl/test_ssl.rb (OpenSSL#test_verify_certificate_identity):
	  test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@41676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-27 11:22:26 +00:00
shyouhei
eca9bf617a merge revision(s) 39384,39509,39511: [Backport #7961]
* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
	  new attribute to read/write entity expansion text limit.  the default
	  limit is 10Kb.

	* lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.

	* lib/rexml/document.rb: move entity_expansion_limit accessor to ...

	* lib/rexml/rexml.rb: ... here to make rexml/text independent from
	  REXML::Document. It causes circular require.

	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit):
	  deprecated.

	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit=):
	  deprecated.

	* lib/rexml/text.rb: add missing require "rexml/rexml" for
	  REXML.entity_expansion_limit.
	  Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]

	* lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...

	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):

	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
	  REXML.entity_expansion_text_limit.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@40812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-05-18 14:55:14 +00:00
shyouhei
2ac236dcbd * error.c (name_err_to_s): we need not infect msg.
* test/ruby/test_exception.rb (TestException#test_exception_to_s_should_not_propagate_untrustedness): test for it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@37148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 04:05:35 +00:00
shyouhei
e48d99f0e5 merge revision(s) 36251:
* eval.c (stack_extend): prevent ALLOCA_N, which reserves a memory
	  space with for restoring machine stack stored in each threads, from
	  optimization out.  backport r34278 from the trunk.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@36253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-29 12:31:25 +00:00
shyouhei
d761c9b178 merge revision(s) 32605:32610:
* backport r32609 from trunk.
	* ext/openssl/ossl_hmac.c: Revert checking return type of
	  HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
	* backport r32606 from trunk.
	* ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex.
	* ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex.
	  Thanks, Jared Jennings, for the patch.
	  [ Ruby 1.9 - Bug #4944 ] [ruby-core:37670]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@36126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-18 09:53:29 +00:00
shyouhei
ef73b34c87 merge revision(s) 32542:
* eval.c (ruby_setjmp): need to save the stack after r2 (the Table
	  of Contents on ppc64) is saved onto the stack by getcontext().
	  based on <https://bugzilla.redhat.com/show_bug.cgi?id=628715>.
	  Bug#4411


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-09 18:12:07 +00:00
shyouhei
15fbb87b59 merge revision(s) 30993:
* ext/bigdecimal/bigdecimal.c (VpMemAlloc): Fixes a bug reported by Drew Yao <ayao at apple.com>


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-07 10:05:59 +00:00
shyouhei
d18b653719 merge revision(s) 23432:
* eval.c (rb_thread_join), ext/thread/thread.c (wake_one): adjusts
	  targets of rest waiting threads to join.  [ruby-core:23457]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-06 06:16:25 +00:00
shyouhei
1acfb03370 merge revision(s) 28324:
* bignum.c (rb_big2dbl), test/ruby/test_bignum.rb (test_to_f):
	  A negative Bignum out of Float range should be converted to -Infinity.
	  [ruby-core:30492] [Bug #3362]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-06 05:47:45 +00:00
shyouhei
996e9cf4e9 @nobu you must run make test-all _before_ you check in.
reverting revision r34920 because it fails.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-06 05:34:55 +00:00
shyouhei
69883b3ee6 merge revision(s) 33611:
* lib/webrick/utils.rb: fix fcntl call.
	* lib/drb/unix.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-06-06 05:20:08 +00:00
svn
c869f69c35 * 2012-05-21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-21 07:35:26 +00:00
knu
b0901e0f63 * ext/syslog/syslog.c (mSyslog_inspect): Make sure self is a
module before calling rb_class2name().



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-21 07:35:21 +00:00
nobu
a4e76099bf * ext/bigdecimal/bigdecimal.c (PUSH): to prevent VALUE from GC,
must not cast it to unsigned long, which may be shorter than
	  VALUE, and the result can be mere garbage.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-11 05:09:58 +00:00
nobu
698d21a276 merge revision(s) 35325:
* bignum.c (rb_big2str0): prevent working clone from
	  GC. [exerb-dev:0578].  patched by MURASE Masamitsu
	  <masamitsu.murase AT gmail.com> at [exerb-dev:0580]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@35327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-14 09:52:10 +00:00
nobu
acc55c25c5 merge revision(s) 34919:
* lib/yaml/rubytypes.rb (Exception.yaml_new): fix bug that causes
	  YAML serialization problem for Exception.
	  Exception#initialize doesn't use visible instance variable for
	  the exception message, so call the method with the message.
	  patched by Jingwen Owen Ou <jingweno AT gmail.com>.
	  http://github.com/ruby/ruby/pull/41


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-03-06 03:06:11 +00:00
nobu
c31e7c1e8b merge revision(s) 25230,34866:
* marshal.c (struct {dump,load}_arg): manage with dfree, instead
	  of using local variable which may be moved by context switch.
	  [ruby-dev:39425]

	* marshal.c (mark_dump_arg): mark destination string.  patch by
	  Vit Ondruch.  [Bug #4339]

	* marshal.c (clear_dump_arg, clear_load_arg): clean up also data
	  tables as same as symbols tables.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-03-02 02:45:35 +00:00
nahi
2cb7a6c056 Backport r34482 from trunk. See #5353
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 06:09:40 +00:00
shyouhei
e19bd3eaa8 -This line, and those below, will be ignored--
M    ruby_1_8_7/ChangeLog
M    ruby_1_8_7/inits.c
M    ruby_1_8_7/version.h
M    ruby_1_8_7/string.c
M    ruby_1_8_7/st.c
M    ruby_1_8_7/test/ruby/test_string.rb
M    ruby_1_8_7/random.c


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-28 12:47:15 +00:00
shyouhei
858cb3f6b9 oops.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34004 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-10 12:24:37 +00:00
shyouhei
16daf9b914 merge revision(s) 32741:
* lib/securerandom.rb: call OpenSSL::Random.seed at the
	  SecureRandom.random_bytes call.
	  based on the patch by Masahiro Tomita.  [ruby-dev:44270]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@32741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-10 12:17:33 +00:00
shyouhei
ff8f8c190b merge revision(s) 20587:
* mkconfig.rb: fix for continued lines.  based on a patch from
	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-10 12:17:30 +00:00
svn
5a7338d85c * 2011-12-10
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-10 12:17:29 +00:00
shyouhei
700acefade merge revision(s) 23730:
* numeric.c (flo_cmp): Infinity is greater than any bignum
	  number.  [ruby-dev:38672]

	* bignum.c (rb_big_cmp): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@34000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-10 12:17:27 +00:00
shyouhei
95a7aabe1e merge revision(s) 27064:
* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
	  store->ex_data.sk.  [ruby-core:28907] [ruby-core:23971]
	  [ruby-core:18121]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@33999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-12-10 12:17:23 +00:00
shyouhei
64a12d32d8 merge revision(s) 32289:
* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-30 03:53:30 +00:00
shyouhei
488fcde070 merge revision(s) 31346,31528:
* ext/openssl/extconf.rb: Should check SSLv2_*method.
	  openssl compiled with "no-ssl2" the extconf don't fail
	  when running `make' having this compilation errors.
	  Patched by Laurent Arnoud. fixes #4562, #4556


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-26 08:58:06 +00:00
shyouhei
46ae2d907e * ext/tk/extconf.rb: copy from trunk, as requested by Hidetoshi NAGAI.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-26 08:47:36 +00:00
shyouhei
d5bd29d381 patchlevel++
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-26 08:24:41 +00:00
svn
9fe3a7c26e * 2011-06-23
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-23 09:44:09 +00:00
nahi
2f50fc74d5 backported r26281 from ruby_1_8
* lib/webrick/accesslog.rb (WEBrick::AccessLog.format): log parameter
  embedding did not work. See #4913.

* test/webrick/test_accesslog.rb: Add for test it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-23 09:44:05 +00:00
svn
24d7cecd09 * 2011-06-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-16 14:22:43 +00:00
nahi
eaf6ad66ab backport r32050 by akr
* lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
  to prevent random number sequence repeatation at forked
  child process which has same pid.
  reported by Eric Wong.  [ruby-core:35765]

backport r32124 by nahi

* test/test_securerandom.rb: Add testcase.  This testcase does NOT aim
  to test cryptographically strongness and randomness.  It includes
  the test for PID recycle issue of OpenSSL described in #4579 but
  it's disabled by default.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@32128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-16 14:22:36 +00:00
shyouhei
61ac67c14b merge revision(s) 31731:31734:
* variable.c (rb_autoload_load):  There is a  race condition while
	  autoloading.  When two or more threads touch a single autoloaded
	  constant at  a time,  one of them  does the require,  but others
	  behave  oddly.   To  fix  this  situation we  now  refrain  from
	  deleting the autoload table while someone is doing the autoload.
	  That  deletion is  deferred to  a  point where  a require  ended
	  successfully.  Doing so make it possible for multiple threads to
	  enter autoloading at the same  time but the require is protected
	  against  multiple simultaneous  entrance anyway  so all  but one
	  thread  gets blocked  at that  point.   So with  it, touching  a
	  constant that gets autoloaded cause those threads to block until
	  there is another one that does the same thing.
	  [ruby-core:36308] (#921)

	* variable.c (rb_const_get_0): ditto.

	* variable.c (autoload_node): ditto.

	* variable.c (autoload_delete): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

	* variable.c (rb_const_get_0):  Fix  previous change.   There were
	  possibilities   when   an   autoload-specified   library   lacks
	  definition of  the constant  it was bound  to.  Once  after such
	  library had  already beed loaded, the autoload  engine shall not
	  reload  it.   Instead  the  interpreter have  to  consider  such
	  constant nonexistent.  It results in a const_missing situation.

	* variable.c (rb_autoload_load): ditto.

	* variable.c (autoload_node): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-02 10:02:20 +00:00
shyouhei
6e96241d31 patchlevel++
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-06-02 10:02:18 +00:00
svn
fbb389a05a * 2011-05-30
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-30 02:09:01 +00:00
nahi
1a8ea0fc0f * lib/logger.rb (Logger::ProgName): do not depend on subversion
keyword ($Id$). ProgName with revision number was written in the 
  header line of each logfile for ease of tracking what version user
  is using in troubleshooting.  Logger is already stable enough.

I commit this on confirmation from Shyouhei.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31806 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-30 02:08:57 +00:00
shyouhei
109ea6449e merge revision(s) 31667:
merge revision(s) 28080:

	* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
	  This caused failure when test/csv is executed with GC.stress = true.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-23 04:49:42 +00:00
shyouhei
396a07307e merge revision(s) 31655:
* eval.c (rb_thread_atfork): When a ruby process forks, its random
	  seed shall be reinitialized to prevent CVE-2003-0900 situation.
	  This bug affects for 1.8 and earlier series, but not for 1.9.
	  fixed [ruby-core:34944].

	* io.c (pipe_open): ditto.

	* random.c (rb_reset_random_seed): ditto.

	* intern.h (rb_reset_random_seed): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-23 04:49:40 +00:00
shyouhei
176061e317 merge revision(s) 31578:
* lib/uri/generic.rb (#route_from_path): Fix a bug where
  URI('http://h/b/').route_to('http://h/b') wrongly returned './'
  (should be '../b'). [Bug #4476]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20 22:29:17 +00:00
shyouhei
79a569f458 merge revision(s) 31575:
* lib/fileutils.rb (FileUtils#touch): Fix corrupted output.
	  ref [ruby-dev:43401]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20 22:29:13 +00:00
shyouhei
c8914f256e merge revision(s) 31312:
* re.h (RMATCH_REGS): parenthesize cast expression.  suggested
	  from Nikolai Weibull in [ruby-core:35825].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20 22:29:10 +00:00
shyouhei
4e5325fe1f merge revision(s) 31302:
backported r31286 from trunk

	* numeric.c (ruby_float_step): wrong loop condition.
	  fixes [ruby-core:35753], reported by Joey Zhou.

	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
	  test above change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@31302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31663 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20 22:29:05 +00:00
shyouhei
72e6e00f1c merge revision(s) 30552:
* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in gzip's header
  is the size of uncompressed input data modulo 2^32.
  [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20 22:29:01 +00:00
shyouhei
b62769eab3 merge revision(s) 30479:
* ext/socket/{getaddrinfo,getnameinfo}.c: include winsock2.h only when
	  specified to use winsock2 by user.
	  this problem is reported by kosaki.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20 22:28:18 +00:00
shyouhei
6bc97ee8b1 merge revision(s) 30457:
* ext/socket/socket.c (make_addrinfo): skip IPv6 addresses when ruby
	  doesn't support IPv6 but system supports it.
	  [ruby-dev:42944] (#4230)

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30457 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@31660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-20 22:25:41 +00:00