Commit graph

24309 commits

Author SHA1 Message Date
naruse
cb1a793510 merge revision(s) 35766:
* io.c (io_strip_bom): check EOF.  [Bug #6487][ruby-core:45203]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-25 01:39:30 +00:00
naruse
046883d2ca merge revision(s) 35644:
* parse.y (f_arglist): should reset lexical states after empty
	  argument list with no parenthesis as well as parenthesized list,
	  so that reserved name method definition work.  [ruby-dev:45626]
	  [Bug #6403]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-25 01:36:52 +00:00
nobu
915cbd051a merge revision(s) 33944:
* io.c: suppress unused-value warnings.  fixup of r33937.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-21 13:24:01 +00:00
knu
72aa68b0d4 merge revision(s) 35738:
* ext/syslog/syslog.c (mSyslog_inspect): Use rb_sprintf().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-21 07:24:50 +00:00
knu
d5ba54a5e0 merge revision(s) 35737:
* 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_9_3@35740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-21 07:24:34 +00:00
naruse
5d43f34a36 merge revision(s) 35451:
* test/drb/drbtest.rb ({DRbCore,DRbAry}#teardown}: cannot pass SIGTERM
	  to another process on Windows, so use SIGINT instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-19 05:42:43 +00:00
naruse
e050fc1bb7 merge revision(s) 35434:
* lib/drb/ssl.rb: generate 1024 bits RSA key instead of 512 bits.
	  OpenSSL 1.0.1 rejects 512 bits RSA key for TLS1.2 with SHA512.
	  http://rt.openssl.org/Ticket/Display.html?id=2769&user=guest&pass=guest
	  reported by Bohuslav Kabrda.
	  [ruby-core:43844] [ruby-trunk - Bug #6221]
	  reported by NARUSE, Yui.  [ruby-dev:45551]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-19 05:42:26 +00:00
naruse
ca27aa831f merge revision(s) 35433:
* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
	  [ruby-dev:45551] reported by NARUSE, Yui.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-19 05:42:08 +00:00
naruse
28db23778c merge revision(s) 35424:
* lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to
	  invoke service subprocess.  mark detach threads for clean up.

	* test/drb/drbtest.rb: clean up the service subprocess in teardown.

	* test/drb/test_drb.rb: set @service_name for teardown.

	* test/drb/test_drbunix.rb: ditto.

	* test/drb/test_drbssl.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-19 05:41:23 +00:00
naruse
336c45eaa2 merge revision(s) 35422:
* lib/drb/ssl.rb: close accepted TCP socket if SSL accept is failed.
	  [ruby-dev:45541]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-19 05:40:58 +00:00
naruse
0ac2587d09 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_9_3@35712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-19 05:40:29 +00:00
nobu
c95748763d * version.h: bump up patchlevel.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35702 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-18 09:21:19 +00:00
nobu
d87f1fc2b5 [ruby-dev:45650]
* lib/mkmf.rb (MakeMakefile#configuration): keep space at end of
  OUTFLAG and COUTFLAG.  [ruby-dev:45650]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-18 09:13:47 +00:00
nobu
9310a593df merge revision(s) 35109,35110,35651: [Backport #6385]
* win32/win32.c (rb_w32_fstat, rb_w32_fstati64): convert FILETIME
	  to time_t directly, not to be affected by TZ unnecessarily.

	* win32/win32.c (unixtime_to_filetime): convert time_t to FILETIME
	  simply.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-17 15:04:57 +00:00
svn
6c29b79807 * 2012-05-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-15 16:10:51 +00:00
tenderlove
17325a1d33 * ext/digest/md5/extconf.rb: use pkg_config for openssl so that
customized ssl paths are used for linking.  Backports fixes for
  [ruby-core:44755].
* ext/digest/rmd160/extconf.rb: ditto
* ext/digest/sha1/extconf.rb: ditto
* ext/digest/sha2/extconf.rb: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-15 16:10:46 +00:00
naruse
e2aeaed633 merge revision(s) 35636,35637: [Backport #6429]
* test/ruby/test_io.rb (TestIO): revert r35631. it broke the intent of
	  test_flush_in_finalizer1.  [ruby-core:43951] [Bug ##6228]

	* test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd
	  to close IO objects. it create IO object with already closed fd, and
	  cause occasional Errno::EBADF in following tests. [ruby-core:45020]
	  [Bug #6228]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35646 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-14 08:14:37 +00:00
naruse
3d55c375a1 merge revision(s) 34796:
* parse.y (parser_tokadd_string): insert a backslash only if
	  quoted by single quotes.  [ruby-dev:45281] [Bug #6069]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-14 04:19:06 +00:00
naruse
26e1ebb15e merge revision(s) 35631:
* test/ruby/test_io.rb (class TestIO):  Disable GC during IO tests to
	  avoid file descriptors being GC'ed. Suggestion by Tomoyuki Chikanaga
	  [ruby-core:43951][Bug #6228]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-14 04:18:05 +00:00
naruse
4a4f81c903 workaround hack for broken ioctl.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-12 04:07:12 +00:00
naruse
209354c036 merge revision(s) 35610:
Skip IPv6 addresses whose interface is set as IFDISABLED.

	FreeBSD 9.0 with default setting (ipv6_activate_all_interfaces
	is not YES) sets IFDISABLED to interfaces which don't have
	global IPv6 address.
	Link-local IPv6 addresses on those interfaces don't work.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-11 21:39:31 +00:00
nobu
67166228c6 * 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_9_3@35619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-11 05:09:58 +00:00
naruse
64b6f2b2a1 merge revision(s) 35594: [Backport #6422]
* io.c (io_unread): fix IO#pos with mode 'r' bug on Windows.
	  If the end of reading buffer is CR, io_unread() needs to unread one
	  more byte.
	  [ruby-core:44874] [Bug #6401]

	* test/ruby/test_io_m17n.rb (TestIO_M17N#test_pos_with_buffer_end_cr):
	  add a test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-10 16:05:13 +00:00
nobu
9a10c97261 merge revision(s) 33978:
* configure.in (RUBY_WERROR_FLAG): append all warning flags which
	  are enabled to compile, so that printf format modifiers properly
	  fail.  [ruby-core:41351] [Bug #5679]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-09 07:00:10 +00:00
naruse
2099780eb6 merge revision(s) 35545,35564,35565:
* lib/securerandom.rb: show actual read length in an error message.

	* lib/securerandom.rb (random_bytes): call to_int method for the
	  argument at first.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 11:25:45 +00:00
naruse
f4be1257a4 merge revision(s) 35555:
* ext/bigdecimal/bigdecimal.c (Init_bigdecimal): define IDs before
	  they are used. [ruby-core:44900] [Bug #6406]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35557 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 02:09:33 +00:00
naruse
551031f172 Revert r35536.
The behavior is expected because of the Unicode 4.1.0. [ruby-dev:45619]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35556 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-07 02:09:06 +00:00
naruse
823f0719fa Remove wrong case conversion U+0294
[ruby-dev:45594] [Bug #6380]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-05-04 12:43:36 +00:00
naruse
7caf259869 merge revision(s) 33196:
* test/rinda/test_rinda.rb (test_core_03_notify): Fixed test failures
	  [ruby-dev:44430] [Ruby 1.9 - Bug #372]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35484 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-27 02:10:17 +00:00
naruse
85f444d407 merge revision(s) 35417:
* test/rinda/test_rinda.rb: fix sticks on some testsf problem 
	  [Bug #6272]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-26 23:30:04 +00:00
nobu
864fdcfb11 merge revision(s) 35467:
* lib/optparse.rb (OptionParser#to_a): split for each lines.
	  [ruby-dev:45568][Bug #6348]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-24 20:57:07 +00:00
naruse
bea7c1c899 merge revision(s) 35462:
* lib/optparse.rb (OptionParser#to_a): should split by end-of-line,
	  and MUST TEST IT, MUST RUN THE TEST, MUST VERIFY BEFORE BACKPORT.
	  [ruby-dev:45568][Bug #6348]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35463 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-24 12:20:52 +00:00
nobu
5d466e51fe merge revision(s) 35455:
* lib/optparse.rb (OptionParser#to_a): should split by end-of-line
	  [ruby-dev:45568][Bug #6348]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-24 06:52:23 +00:00
nobu
87b770c8e3 merge revision(s) 35453:
* lib/optparse.rb (OptionParser#to_a): String#to_a is no longer
	  defined.  [ruby-dev:45568][Bug #6348]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35454 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-24 05:55:54 +00:00
nobu
a834d7fe61 merge revision(s) 35366,35377,35399,35406:
* strftime.c (rb_strftime_with_timespec): fix padding of time zone
	  offset.  [ruby-dev:43287][Bug #4458]

	* strftime.c (rb_strftime_with_timespec): add an interim digit for
	  the timezone offset which is less than an hour.

	* strftime.c (rb_strftime_with_timespec): fix carry-up bug and
	  overwrite '+' with '-' if negative offset less than a hour.
	  [ruby-core:44447][Bug #6323]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35416 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-20 22:16:21 +00:00
drbrain
eaa1fccf1d Merged r35411 from trunk:
* lib/rubygems/ssl_certs/AddTrustExternalCARoot.pem:  Removed to avoid
  conflict with ca-bundle.pem
* lib/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem:
  ditto.
* lib/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem:
  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-20 03:38:54 +00:00
naruse
1abf777e3f merge revision(s) 35389:
Use mock of Gem::Security::OPT[:trust_dir]

	Gem::Security::OPT[:trust_dir] depends Gem.user_home but doesn't reset
	on setup/teardown.
	NOTE: Gem.user_home won't be recovered now, so teardown doesn't work.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-20 00:22:11 +00:00
drbrain
d927018018 Backport security fixes for rubygems from r35404
* lib/rubygems:  Update to RubyGems 1.8.23 which contains security
  fixes:

  RubyGems now disallows redirection from HTTPS to HTTP.

  RubyGems now verifies SSL connections.

  See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
  changes since 1.8.22.
* test/rubygems:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-19 23:38:41 +00:00
svn
39573b4b77 * 2012-04-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-19 22:43:22 +00:00
drbrain
de280961df Backport r35374 and r35375
* lib/rubygems:  Update to RubyGems 1.8.22 plus r33517 and r35337 which
  were ported to the rubygems git repository.

  See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
  changes since 1.8.11.

* test/rubygems:  ditto.

* lib/rubygems/version.rb:  Fixed init_with warning by calling into
  yaml_initialize (for syck) from psych's init_with



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-19 22:43:16 +00:00
nobu
b51081308b merge revision(s) 35395:
* ext/-test-/win32/dln/extconf.rb: need import library for ordinal
	  entry even on mingw.  [ruby-core:44441][Bug #6320]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-19 03:55:38 +00:00
nobu
24620aaf1c merge revision(s) 35387:
* configure.in (DOT, DOXYGEN): use AC_CHECK_PROGS instead of
	  AC_CHECK_PROG which needs the third argument.  [ruby-core:44433]
	  [Bug #6316]

	* configure.in (PKG_CONFIG): fix condition to skip older version
	  of pkg-config.  continue in backticks does not affect outside.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-18 14:09:04 +00:00
nobu
5468593e14 merge revision(s) 35368:
* ext/-test-/win32/dln/extconf.rb: fix for mingw.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-17 14:22:01 +00:00
naruse
4f0439617e merge revision(s) 34419: [Backport #6307]
* lib/rexml/parsers/baseparser.rb, test/rexml/test_namespace.rb:
	  fix the default xml namespace URI validation.
	  [ruby-dev:45169] [Bug #5956]
	  Reported by Miho Hiramatsu. Thanks!!!


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35365 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-17 12:36:07 +00:00
naruse
e1a08e4130 merge revision(s) 35363:
win32/dln is only for win32.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-17 11:36:31 +00:00
nobu
a940590a43 merge revision(s) 35354,35356,35357,35361:
* dln.c (rb_w32_check_imported): skip ordinal entries.  based on a
	  patch by phasis68 (Heesob Park) at [ruby-core:44381].
	  [ruby-core:44371][Bug #6303]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-17 05:27:25 +00:00
nobu
1ca2a6d729 merge revision(s) 35352:
* dln.c (rb_w32_check_imported): skip ordinal entries.  patched by
	  phasis68 (Heesob Park) at [ruby-core:44381].  [Bug #6303]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-16 12:26:30 +00:00
svn
ec9ccb527c * 2012-04-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-16 11:15:36 +00:00
naruse
34c1a1691b Merge eacb6564c05ff7428bcbb3c34f72655b1b5d6ca3.
[Backport #6304]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-16 11:15:31 +00:00
naruse
89d7ac8090 merge revision(s) 34106:
* test/test_pty.rb (test_pty_check_default): call PTY.check until
	  "cat" command is finished.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-04-15 05:57:08 +00:00