Commit graph

3630 commits

Author SHA1 Message Date
usa
b5a6ad3f8c merge revision(s) 37296: [Backport #7205]
* configure.in (visibility_option): visibility attribute is not
	  available before GCC 4, so do not use -fvisibility option in that
	  case.  [ruby-core:48147] [Bug #7205]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-08 05:14:10 +00:00
usa
b91f5c75ed merge revision(s) 37270: [Backport #7185]
* vm.c (rb_vm_jump_tag_but_local_jump): pass through thrown objects.
	  [ruby-dev:46234] [Bug #7185]

	* vm_eval.c (rb_eval_cmd): if state is non-zero, val should be nil and
	  rb_vm_jump_tag_but_local_jump() just jump tag.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-08 05:12:00 +00:00
usa
583d9edebb merge revision(s) 37406: [Backport #7176]
* ext/bigdecimal/bigdecimal.c (BigDecimal_add),
	  test/bigdecimal/test_bigdecimal.rb:
	  need to specify precision for converting Rational and Float.
	  [ruby-core:48045] [Bug #7176]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-08 05:09:39 +00:00
usa
c58402cde1 merge revision(s) 37322: [Backport #7143]
* win32/win32.c (has_redirection): should use shell (cmd.exe) when
	  the commandline containts '&'.
	  reported by Roger Pack at [ruby-core:47912] [Bug #7143], and
	  patched by Heesob Park at [ruby-core:47931].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-08 05:05:45 +00:00
svn
79e95a4d38 * 2012-11-08
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-07 19:49:45 +00:00
usa
43294dff52 merge revision(s) 34397: [Backport #6881]
* file.c (append_fspath): need to set the encoding to result always.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-26 08:22:31 +00:00
usa
48e9586498 merge revision(s) 34374: [Backport #6681]
* file.c (rmext): no extension to strip if empty string.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-26 05:08:46 +00:00
usa
0e6dcc7ab2 merge revision(s) 32826,34732: [Backport #6681]
* file.c (rb_enc_path_next, rb_enc_path_skip_prefix)
  (rb_enc_path_last_separator, rb_enc_path_end)
  (ruby_enc_find_basename, ruby_enc_find_extname): encoding-aware
  path handling functions.

* file.c (rb_home_dir, file_expand_path, rb_realpath_internal)
  (rb_file_s_basename, rb_file_dirname, rb_file_s_extname)
  (rb_file_join): should respect the encodings of arguments than
  file system encoding.  [ruby-dev:45145] [Bug #5919]

* dir.c (check_dirname, ruby_glob0): ditto.

* ext/pathname/pathname.c (path_sub_ext): ditto.

* util.c, include/ruby/util.h (ruby_add_suffix): remove the function.
  [Bug #5153] [ruby-core:38736]

* io.c (argf_next_argv): remove the call of above function.

* ext/-test-/add_suffix, test/-ext-/test_add_suffix.rb: remove the test
  extension module because this is only for testsing ruby_add_suffix().

* LEGAL: remove the mention about a part of util.c, because now we
  removed the part.

* io.c (argf_next_argv): now the new filename is not guranteed to
  use, so should check the return value of rename(2).

* test/ruby/test_argf.rb (TestArgf#test_inplace_rename_impossible):
  now we expect same result with other platforms on no_safe_rename
  platforms (=Windows).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-26 03:01:41 +00:00
usa
c5b7d11e59 merge revision(s) 35488:
* ext/-test-/win32/dln/extconf.rb: remove test DLL.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-26 00:52:58 +00:00
usa
bc4be91a55 merge revision(s) 37048:
* lib/rubygems/installer.rb (check_that_user_bin_dir_is_in_path):
	  test_generate_bin_bindir_with_user_install_warning(TestGemInstaller)
	  fails on Windows with msys bash. It makes comparing paths
	  case-insensitive.
	  pick from upstream to fix a failure of test-all [ruby-core:47711]
	  c474edb2f3


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-25 09:18:59 +00:00
usa
d75e2ea21f merge revision(s) 37032:
test_gem_installer.rb: restore ARGV

	* test/rubygems/test_gem_installer.rb
  (TestGemInstaller#test_install_creates_binstub_that_dont_trust_encoding):
  restore ARGV properly, non-ascii strings in different encodings are
  not equal.  [ruby-core:45975] [Bug #6673]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37324 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-25 09:16:08 +00:00
usa
73c592d570 merge revision(s) 36636:
* test/etc/test_etc.rb (TestEtc#test_getpwuid): `s' is never set to nil.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-25 09:11:09 +00:00
usa
2c40007895 merge revision(s) 34849,34853,34854,34855,34859,34862,35384,35385,36811,36812,36850,36907,36908: [Backport #7174]
* Makefile.in (PLATFORM_DIR): add a variable for `win32` directory.

	* Makefile.in (clean-platform): add new target.
	  It cleans `win32` directory.

	* common.mk (clean): add a dependency for `win32` directory.

	* common.mk (distclean): ditto.

	* common.mk (distclean-platform): add new target.
	  It cleans `win32` directory.

	* common.mk ($(PLATFORM_D)): add new target to make `win32` directory.

	* common.mk (win32/win32.$(OBJEXT)): move win32.o into `win32`
	  directory.

	* common.mk (win32/file.$(OBJEXT)): add new target for win32/file.c.

	* configure.in: move win32.o into `win32` directory and add
	  win32/file.o to MISSING.

	* file.c (file_load_ok, rb_file_load_ok): replace static
	  file_load_ok() with public rb_file_load_ok().
	  It's to link Windows implementation in win32/file.c.

	* file.c (rb_find_file_ext_safe): ditto.

	* file.c (rb_find_file_safe): ditto.

	* win32/file.c (rb_file_load_ok): new file. Add Windows specific
	  optimized implementation of rb_file_load_ok(). We created a
	  separated file to avoid too many #ifdef macro which is unreadable.

	* win32/Makefile.sub (PLATFORM_DIR): add a variable for `win32`
	  directory.

	* win32/Makefile.sub (MISSING): move win32.obj into `win32`
	  directory and add win32/file.obj to MISSING.

	* win32/Makefile.sub (MAKEDIRS): replace MINIRUBY with BASERUBY.
	  It's because miniruby doesn't exist when making `win32` directory.

	* win32/Makefile.sub (clean-platform): add new target to clean `win32`
	  directory.

	* win32/Makefile.sub ({$(srcdir)}.c{}.obj): make it not match
	  win32/file.c to build properly.

	* win32/Makefile.sub (win32/win32.$(OBJEXT)): move win32.obj into
	 `win32` directory.
	  Patch created with Luis Lavena.
	  [ruby-core:42480] [Feature #5999]

	* win32/Makefile.sub (MAKEDIRS): use mkdir of cmd.exe instead of ruby.
	  [Bug #6103] [ruby-core:43012]

	* win32/README.win32: added a notice about command extension of cmd.exe.

	* win32/makedirs.bat: new command to make intermediate
	  directories, and not to report any errors if the directory
	  already exists.

	* win32/Makefile.sub (MAKEDIRS): enable command extensions.

	* win32/file.c (INVALID_FILE_ATTRIBUTES): define for old SDK.

	* configure.in (mingw): add shlwapi to the list of dependency
	  libs for Windows.

	* win32/Makefile.sub (EXTSOLIBS): ditto.

	* internal.h: declare internal functions rb_w32_init_file,
	  rb_file_expand_path_internal and rb_file_expand_path_fast.

	* file.c (Init_File): invoke Windows initialization rb_w32_init_file

	* win32/file.c (rb_file_load_path_internal): new function.
	  Windows-specific implementation that replaces file_expand_path.
	  [Bug #6836][ruby-core:46996]

	* win32/file.c (rb_w32_init_file): new function. Initialize codepage
	  cache for faster conversion encodings lookup.

	* file.c (file_expand_path): rename to rb_file_expand_path_internal.
	  Conditionally exclude from Windows.

	* file.c (rb_file_expand_path_fast): new function. delegates to
	  rb_file_expand_path_internal without performing a hit to the
	  filesystem.

	* file.c (file_expand_path_1): use rb_file_expand_path_internal without
	  path expansion (used by require).

	* file.c (rb_find_file_ext_safe): ditto.

	* file.c (rb_find_file_safe): ditto.

	* load.c (rb_get_expanded_load_path): use rb_file_expand_path_fast.

	* load.c (rb_feature_provided): ditto.

	* file.c (rb_file_expand_path): use rb_file_expand_path_internal with
	  path expansion.

	* file.c (rb_file_absolute_path): ditto.

	* test/ruby/test_file_exhaustive.rb: new tests to exercise
	  rb_file_expand_path_internal implementation and compliance with
	  existing behaviors.

	* test/ruby/test_file_exhaustive.rb: fix test introduced in r36811 for
	  posix environments where HOME is not defined.  [ruby-core:47322]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-25 08:16:34 +00:00
usa
9b1d07629d merge revision(s) 37242: [Backport #7120]
* configure.in (opt-dir): allow multiple directories separated by
	  $PATH_SEPARATOR as well as dir_config in mkmf.rb. [ruby-core:47868]
	  [Bug #7120]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-19 04:31:50 +00:00
usa
772640a207 merge revision(s) 37153: [Backport #6207]
* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as
	  default library path.  [ruby-core:43726] [Bug #6207]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-16 02:19:25 +00:00
usa
62f6e9242c merge revision(s) 36625: [Backport #6831]
test_etc.rb: remove implicit assumption

	* test/etc/test_etc.rb (TestEtc#test_getpwuid): remove implicit
  assumption, that getpwuid() would return the first entry in the
  order of getpw(), for shared UID.  apparently it is not true on
  MacOS X 10.8.  [ruby-core:46975][Bug #6831]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-16 02:13:44 +00:00
usa
e9ff4a22df merge revision(s) 36800: [Backport #6377]
* file.c (rb_find_file_ext_safe, rb_find_file_safe): default to
  US-ASCII for encdb and transdb.

* load.c (search_required): keep encoding of feature name.  set
  loading path to filesystem encoding.  [Bug #6377][ruby-core:44750]

* ruby.c (add_modules, require_libraries): assume default external
  encoding as well as ARGV.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-16 02:11:36 +00:00
usa
ae5930a892 merge revision(s) 34977: [Backport #5661]
* random.c (random_s_rand): ensure default PRNG is re-initialized
	  after fork.  patched by Eric Wong.  [ruby-core:41209][Bug #5661]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-16 01:55:31 +00:00
usa
259d9dbc20 merge revision(s) 37177: [Backport #7157]
* ruby.c (rb_f_sub, rb_f_gsub): pass the given block.
	  [ruby-core:47967] [Bug #7157]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37205 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-16 01:21:57 +00:00
usa
535649eed1 merge revision(s) 37169: [Backport #7169]
use tty(1) to check if /dev/tty is usable or not

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-16 00:49:23 +00:00
usa
998a398189 merge revision(s) 37201,37202:
* test/ruby/test_regexp.rb
	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): ignoring
	  warnings are already set in setup method.

	* test/ruby/test_regexp.rb
	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): use
	  Regexp.new instead of literal to ignore a parser warning.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-16 00:48:04 +00:00
usa
c3e874d73d merge revision(s) 37175:
* regparse.c (parse_char_class): should match with a hyphen after a
	  range in a character class.

	* test/ruby/test_regexp.rb (TestRegexp#test_char_class): fixed wrong
	  test.

	* test/ruby/test_regexp.rb (TestRegexp#check): now can accept the
	  error message.

	* test/ruby/test_regexp.rb
	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): renamed
	  because the previous name was wrong.

	* test/ruby/test_regexp.rb
	  (TextRegexp#test_raw_hyphen_and_tk_char_type_after_range): added
	  more test pattern.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-13 16:23:17 +00:00
usa
88e264d23d * regparse.c (parse_char_class): also need to check the type of token
after raw hyphen in regexp class, because the charcter code area
  is union'ed with the property of TK_CHAR_TYPE.
  reported by Bushi Zhang at [ruby-core:47115] [Backport #6853].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 16:47:05 +00:00
usa
cc251c2f9f merge revision(s) 37171:
* test/ruby/test_regexp.rb
	  (TestRegexp#test_raw_hyphen_and_type_char_after_range): added new
	  test. ref [ruby-core:47115] [Backport #6853]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 16:41:34 +00:00
usa
b12a9cfb59 merge revision(s) 37163:
* file.c (rb_get_path_check): path name must not contain NUL bytes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37164 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 09:22:06 +00:00
usa
57008f8957 merge revision(s) 37068:
* error.c (exc_to_s, name_err_to_s, name_err_mesg_to_str): do not
	  taint messages.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 08:55:41 +00:00
usa
6ae7a4fcf6 merge revision(s) 33857,37157:
Run the test only if /dev/tty exists.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 08:37:54 +00:00
usa
2efac157b8 merge revision(s) 36847,36873: [Backport #7115]
* configure.in (LIBDIR_BASENAME): use configured libdir value to fix
	  --enable-load-relative on systems where libdir is not default value,
	  overridden in config.site files.  [ruby-core:47267] [Bug #6903]

	* ruby.c (ruby_init_loadpath_safe): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 07:24:42 +00:00
usa
c171c83485 merge revision(s) 33215:
* test/rexml/test_encoding.rb:
	  Add require 'require 'rexml/document'


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 04:56:54 +00:00
usa
58fef6226e merge revision(s) 35015:
* numeric.c (flodivmod): must through the same pass if HAVE_FMOD or not.
  this is a bugfix of r35013.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 04:38:43 +00:00
usa
30fbe3a931 * io.c (rb_cloexec_fcntl_dupfd): get rid of compile error on windows.
reported by Donovan Lampa at [ruby-core:43152] [Backport #6127],
  based on a patch by Hiroshi Shirosaki at [ruby-core:47917].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 04:31:48 +00:00
naruse
226689a2e8 Remove wrong tests of r37144
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 00:33:53 +00:00
naruse
3036104a6a merge revision(s) 33819,33839:
* io.c (ioctl_narg_len): don't use _IOC_SIZE macro on Linux.
          On Linux some constants for ioctl(2) doesn't include the size of
          its return value and 16bit value; for example FIONREAD 0x541B.
          Moreover the manual, ioctl_list(2),  says "Note  that  the  size
          bits  are  very unreliable: in lots of cases they are wrong,
          either because of buggy macros using sizeof(sizeof(struct)),
          or because of legacy values."
          So we shouldn't use it.

        * io.c (ioctl_narg_len, linux_iocparm_len): reinstantiate linux
          specific narg length calculation.

        * test/ruby/test_io.rb (test_ioctl_linux2): add new test for old and
          unstructured ioctl.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-11 15:34:34 +00:00
svn
a9f1e5dafb * 2012-10-11
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-11 06:47:42 +00:00
naruse
6249dac0ae merge revision(s) 36544: [Backport #7017]
* win32/mkexports.rb: should not export DllMain().
	  reported by luis at [ruby-core:46743] [Bug #6790], solved by
	  Heesob Park, and confirmed by nobu.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-25 00:30:46 +00:00
naruse
0414c9b901 merge revision(s) 36522: [Backport #7016]
* include/ruby/win32.h (rb_w32_pow): add new function.
	  We use powl() instead of broken pow() for x64-mingw32. This workaround
	  fixes test failures related to floating point numeric.
	  [ruby-core:46686] [Bug #6784]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-24 07:34:51 +00:00
naruse
5841efa380 merge revision(s) 36508: [Backport #7015]
* test/win32ole/test_win32ole_method.rb (is_ruby64?): Correct platform
	  used to identify mingw-w64 (x64-mingw32). Patch by Hiroshi Shirosaki.
	  [ruby-core:46651][Bug #6782]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-24 01:39:14 +00:00
naruse
e518f1dd32 merge revision(s) 36247: [Backport #7014]
* lib/test/unit/parallel.rb: workaround fix for rubygems.
	  RubyGems can't find rake if the source directory is not equal to
	  the directory which is running the test. [Bug #6604]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-24 01:38:04 +00:00
naruse
01865d5bc6 merge revision(s) 35485: [Backport #7013]
* ext/dl/cfunc.c (rb_dlcfunc_call): should convert a Bignum value to
	  unsigned long long on Win64.
	  [ruby-core:44636][Bug #6364] reported by raylinn@gmail.com (ray linn)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-21 10:53:50 +00:00
naruse
a0a7608bb2 merge revision(s) 33989:["7012"]
* include/ruby/win32.h: undef stat to silence mingw-w64 stat
	  redefinition warnings (GCC 4.6.3).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-21 09:45:52 +00:00
naruse
9b6f7d3881 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
2012-09-21 08:55:31 +00:00
kosaki
3ae3c424ce * 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
2012-09-20 14:34:12 +00:00
naruse
807c13cc61 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
2012-09-09 14:01:53 +00:00
kosaki
390bbfed58 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
2012-09-09 06:44:20 +00:00
kosaki
1048cf39d0 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
2012-09-09 06:39:23 +00:00
kosaki
c2cb8ea317 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
2012-09-09 06:30:21 +00:00
svn
09729a5693 * 2012-08-31
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36858 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-08-30 16:21:49 +00:00
naruse
bed2ff29ba 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-30 16:21:44 +00:00
naruse
7f9630172c 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
2012-08-27 15:40:30 +00:00
naruse
8433e20f65 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
2012-08-23 03:10:26 +00:00