Commit graph

3803 commits

Author SHA1 Message Date
nagachika
2fbe19cc4e merge revision(s) 39291:
* configure.in: remove debug print.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-04 14:54:40 +00:00
nagachika
7a730fe143 merge revision(s) 39286,39287:
* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
	  [Github tenderlove/psych#118]
	  [Github tenderlove/psych#127]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-04 14:43:08 +00:00
nagachika
b501eda42f merge revision(s) 39284: [Backport #7860]
* tool/mkconfig.rb: remove prefix from rubyarchdir.
	  r39267 expands variables, it changes expansion timing,
	  breaks RbConfig::CONFIG["includedir"] and building
	  extension libraries with installed ruby.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-04 14:37:48 +00:00
nagachika
3e23e2dd51 merge revision(s) 39283:
* .gdbinit (iseq): rename dummy_gdb_enums to ruby_dummy_gdb_enums.
  This is follow up to changes in r24407.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 17:59:01 +00:00
nagachika
2925654b04 merge revision(s) 39282: [Backport #8007]
* vm.c (ENV_IN_HEAP_P): fix off-by-one error.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 17:45:28 +00:00
nagachika
cdac7f430d merge revision(s) 39277:
* test/ruby/test_thread.rb: fixed typo
	  patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 17:39:26 +00:00
nagachika
7af9573be2 merge revision(s) 39253:
win32.c: style

	* win32/win32.c (rb_w32_fd_is_text): adjust style.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 17:28:03 +00:00
nagachika
e8237c5b32 merge revision(s) 39236: [Backport #7841]
* class.c (include_modules_at): detect cyclic prepend with original
	  method table.  [ruby-core:52205] [Bug #7841]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 17:24:30 +00:00
nagachika
362f70c3cf merge revision(s) 39234,39235: [Backport #7843]
* vm_method.c: call method_removed hook on called class, not on
	  prepending iclass.
	  prepending iclass.  [ruby-core:52207] [Bug #7843]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 17:17:59 +00:00
nagachika
00ded5b259 merge revision(s) 39214,39221: [Backport #7830]
configure.in: Werror-implicit-function-declaration

	* configure.in (warnflags): -Werror-implicit-function-declaration
  haven't been used as-is, but always replaced with -Werror= or -W.
	* configure.in (warnflags): disable -Werror by default unless
	  development.  [ruby-core:52131] [Bug #7830]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 16:59:29 +00:00
nagachika
69ac3b4db5 merge revision(s) 39184:
add doc. for IO#close_on_exec=.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-02 16:46:00 +00:00
nagachika
77f603cbc9 merge revision(s) 39179,39245: [Backport #7826]
the process maybe already finished
	* test/ruby/test_process.rb (test_setsid): Added a workaround for
	  MacOS X. Patch by nagachika. [Bug #7826] [ruby-core:52126]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39513 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-26 15:22:53 +00:00
nagachika
8fa5da9ae9 merge revision(s) 39169:
release manager finally decided to revert it.

	* eval.c (rb_ensure): preserve errinfo across ensure proc before


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-26 14:48:14 +00:00
mame
8c101e95c6 * version.h: changed version string like
`ruby 1.9.3p327 (2012-11-10 revision 37606) [x86_64-linux]`


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-24 08:01:32 +00:00
mame
c81c3efa1f bump version
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-24 06:54:56 +00:00
svn
73b79a6217 * 2013-02-24
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23 17:41:52 +00:00
svn
c9d00de53b * 2013-02-23
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39390 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 17:49:29 +00:00
usa
11d79c680f merge revision(s) 39384:
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-22 10:22:20 +00:00
svn
a710cba50f * 2013-02-21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39341 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-20 18:11:28 +00:00
svn
71fc34636a * 2013-02-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-19 23:57:17 +00:00
svn
2e4dfbca26 * 2013-02-19
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-18 23:12:30 +00:00
svn
6c10ebe226 * 2013-02-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-16 11:45:32 +00:00
naruse
ddddf044b2 merge revision(s) 39232,39233,39238: [Backport #7831][Backport #7852]
* lib/net/http:  Do not handle Content-Encoding when the user sets
	  Accept-Encoding.  This allows users to handle Content-Encoding for
	  themselves.  This restores backwards-compatibility with Ruby 1.x.

	* lib/net/http/generic_request.rb:  ditto.

	* lib/net/http/response.rb:  ditto

	* test/net/http/test_http.rb:  Test for the above.

	* test/net/http/test_http_request.rb:  ditto.

	* test/net/http/test_httpresponse.rb:  ditto.
	  [ruby-trunk - Bug #7831]

	* lib/net/http.rb:  Removed OpenSSL dependency from Net::HTTP.

	* test/net/http/test_http.rb:  Remove Zlib dependency from tests.

	* test/net/http/test_http_request.rb:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-14 15:51:45 +00:00
svn
9476346ef5 * 2013-02-14
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 22:02:47 +00:00
naruse
b7b9aa6609 merge revision(s) 39208:
* ext/json: merge JSON 1.7.7.
	  This includes security fix. [CVE-2013-0269]
	  d0a62f3ced
	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-13 06:34:48 +00:00
svn
88cc04cf42 * 2013-02-09
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-09 12:16:49 +00:00
svn
876b0d27d3 * 2013-02-08
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-07 15:07:42 +00:00
svn
efcc536b1d * 2013-02-07
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-06 16:35:19 +00:00
svn
1e32d0fc1f * 2013-02-06
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-05 15:55:47 +00:00
svn
f691d4a554 * 2013-02-05
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-04 17:59:58 +00:00
svn
63bedf5d65 * 2013-02-04
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39034 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-03 17:40:35 +00:00
svn
0d7a197175 * 2013-02-03
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-03 00:37:30 +00:00
svn
4b4d889fe0 * 2013-02-02
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-01 15:46:15 +00:00
svn
8df20dd70b * 2013-02-01
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39001 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-01 00:47:54 +00:00
svn
625119a348 * 2013-01-31
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-31 04:59:36 +00:00
svn
996ff13242 * 2013-01-30
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-29 18:58:41 +00:00
svn
ae04783559 * 2013-01-29
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-29 00:32:10 +00:00
svn
ea632a6daa * 2013-01-28
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-28 03:34:50 +00:00
svn
dbf8e164ce * 2013-01-27
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-26 19:18:23 +00:00
svn
6b36e95851 * 2013-01-26
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-25 17:15:10 +00:00
svn
e2d341d9e5 * 2013-01-25
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-25 00:15:14 +00:00
svn
ce0ed2e04e * 2013-01-24
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-23 20:05:26 +00:00
svn
95548d9dc3 * 2013-01-23
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-22 21:43:50 +00:00
svn
7d6f22f4cd * 2013-01-22
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-22 02:35:52 +00:00
svn
5e031bbc74 * 2013-01-21
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-21 04:51:30 +00:00
svn
8d83736f0c * 2013-01-20
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-20 01:19:49 +00:00
svn
672da11abf * 2013-01-19
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-18 23:47:56 +00:00
svn
6a052813d0 * 2013-01-18
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-18 02:18:35 +00:00
svn
93b115346f * 2013-01-17
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-16 21:54:45 +00:00
svn
4b8bb0f95f * 2013-01-16
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-01-15 18:06:35 +00:00