merge revision(s) 36454:

	* include/ruby/intern.h (rb_num_zerodiv): Added NORETURN.
	  Patched by Xi Wang. [Bug #6736]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 36455:

	* bignum.c: Added #include <strings.h> for ffs(). Patch by Perry
	  Smith. Thank you. [Bug #6748]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 34716:

	* template/ruby.pc.in: added rubylibprefix, {rubylib,vendor,site}dir
	  and {ruby,vendor,site}archdir.  [ruby-core:42766][Feature #6052]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 34880:

	* configure.in (ruby_pc): make configurable.  [Bug #6051]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36562 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 36455: [Backport #6772]

	* ext/curses/extconf.rb: support PDCurses.  patched by Luis Lavena.
	  [ruby-core:46485] [Feature #6735]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) r36583, r36458, r36414, r36103, r35690, r35681, r35658, r35657, r35655, r35492: [Backport #6815]

    * ext/psych/lib/psych.rb: updated to released version.

    * ext/psych/psych.gemspec: ditto

    * ext/psych/emitter.c (initialize): allow a configuration object to be
      passed to the constructor so that mutation isn't required after
      instantiation.

    * ext/psych/lib/psych/handler.rb: add configuration object

    * ext/psych/lib/psych/visitors/emitter.rb: use configuration object if
      extra configuration is present.

    * ext/psych/lib/psych/visitors/to_ruby.rb: strings with YAML anchors
      are properly referenced. Patched by Joe Rafaniello via Github:
        https://github.com/tenderlove/psych/pull/69
    * ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
    * test/psych/test_alias_and_anchor.rb: test for change

    * ext/psych/lib/psych.rb: bumping psych to 1.3.3
    * ext/psych/psych.gemspec: ditto

    * ext/psych/extconf.rb: Use an exception instaed of bare abort.

    * ext/psych/parser.c (transcode_string): fix encoding index names.
      Thanks markizko for reporting.

    * ext/psych/lib/psych/visitors/to_ruby.rb: fix a bug with string
      subclass dumping and loading.

    * test/psych/test_array.rb: pertinent tests

    * test/psych/test_string.rb: ditto

    * ext/psych/lib/psych/visitors/to_ruby.rb: convert omap tagged maps to
      Psych::Omap objects rather than hashes. [Bug #6425]

    * test/psych/test_omap.rb: pertinent test.

    * ext/psych/lib/psych/visitors/yaml_tree.rb: keep a reference to
      custom coders so that GC does not impact dumped yaml reference ids.

    * ext/psych/lib/psych/json/yaml_events.rb: implicit styles should not
      be changeable for JSON events.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2012-08-08

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 34972:

	* pack.c (pack_unpack): when unpack('M') occurs an illegal byte
	  sequence, output the "=" character and the following character in
	  the decoded data without any transformation.
	  [ruby-dev:44875] [Bug #5635]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33991:

	* file.c (file_path_convert): don't convert it when the path string is
	  ascii only. [ruby-core:41556] [Bug #5733]
	  tests are contributed by nobu.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 35978,36013,36014,36015,36052,36076,36487: [Backport #6898]

	* thread_pthread.c (ruby_init_stack): use stack info if possible.

	* thread_pthread.c (ruby_init_stack): adjust stack size for offset of
	  addr from the bottom.

	* thread_pthread.c (get_stack): seems stack size does not include
	  guard size on Mac OS X.

	* gc.h (IS_STACK_DIR_UPPER): utility macro.

	* thread_pthread.c (get_stack): Linux is the only OS which includes
	  the size of guard page into the stack size.

	* thread_pthread.c (ruby_init_stack): STACK_GROW_DIR_DETECTION is
	  necessary on platforms with unknown stack direction.  [Bug #6761]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 36668: [Backport #6846]

	* test/ruby/test_file_exhaustive.rb
	  (TestFileExhaustive#test_stat_special_file): add a test.
	  GetFileAttributesExW fails to get attributes of special files
	  such as pagefile.sys.

	* win32/win32.c (check_valid_dir): for performance, check the path
	  by FindFirstFileW only if the path contains "...".

	* win32/win32.c (winnt_stat): use GetFileAttributesExW instead of
	  FindFirstFileW since GetFileAttributesExW is faster.
	  Based on the patch by Dusan D. Majkic.
	  [ruby-core:47083] [Feature #6845]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33772:

	* test/webrick/test_cgi.rb (TestWEBrickCGI#start_cgi_server): there are
	  no guarantee of existance of RbConfig::CONFIG['LIBPATHENV'].
	  it only exists in Unix-like environments.

	* test/webrick/test_filehandler.rb
	  (WEBrick::TestFileHandler#test_script_disclosure): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 36852:

	* lib/uri/ftp.rb (URI::FTP#initialize): raise InvalidURIError if "//"
	  is not present [ruby-core:47344] [Bug #6945]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2012-08-31

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 36926:

	* thread.c (rb_mutex_lock): stop multiple threads use
	  pthread_cond_timedwait() concurrently. [Bug #6278] [ruby-core:44275]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 35685

* ext/extmk.rb: Show a message when extconf.rb raised an exception.
* ext/openssl/extconf.rb: Use exception raising instead of message
  and/or abort. We want to display error message to console _and_
  logging into mkmf.log.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 35687:35691:

	* ext/zlib/extconf.rb: Use an exception instaed of bare puts.

	* ext/psych/extconf.rb: Use an exception instaed of bare abort.

	* ext/fiddle/extconf.rb: Use an exception instaed of bare abort.

	* ext/readline/extconf.rb: Use an exception instead of bare exit.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 35496:

	* ext/zlib/extconf.rb: detect z_crc_t type which will be defined
	  since zlib-1.2.7.

	* ext/zlib/zlib.c (rb_zlib_crc_table): use z_crc_t if available.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* thread_pthread.c (native_cond_initialize): destroy condattr
  after using it. Patch by Stanislav Sedov. Thank you.
  [Bug #7041] [ruby-core:47619]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 33830: [Backport #7011]

	* configure.in: add -Wall always.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e