version 1.0-971002v1_0_971002

https://cache.ruby-lang.org/pub/ruby/1.0/ruby-1.0-971002.tar.gz

Thu Oct  2 17:59:18 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-971002

Wed Oct  1 14:01:49 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* ext/marshal/marshal.c (w_byte): argument must be char.

Wed Oct  1 10:30:22 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* ext/marshal/marshal.c (marshal_dump): try to set binmode.

	* ext/marshal/marshal.c (r_object): forgot to re-regist structs in
	  the object table.

	* eval.c (ruby_options): call Init_ext() before any require()
 	  calls by `-r'.

Tue Sep 30 14:51:07 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970930

Fri Sep 30 14:29:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* ext/marshal/marshal.c (w_object): marshal dumped core.

Tue Sep 30 10:27:39 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* sample/test.rb: bignum test suits added.

Mon Sep 29 13:37:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* ruby.c (forbid_setid): forbid some options in suid mode.

Mon Sep 27 09:53:48 1997  EGUCHI Matsumoto  <eguchi@shizuokanet.or.jp>

	* bignum.c: modified for speeding.

Fri Sep 26 18:27:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* sample/from.rb: some extensions.

Mon Sep 29 13:15:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* parse.y (lhs): no more syntax error on `obj.CONSTANT = value'.

Fri Sep 26 14:41:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* eval.c (ruby_run): deferred calling Init_ext() just before eval_node.

Fri Sep 26 13:27:24 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* io.c (io_isatty): forgot to return TRUE value.

Fri Sep 25 11:10:58 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>

	* eval.c: use _setjmp/_longjmp instead of setjmp/longjmp on some
	  platforms.

Wed Sep 24 17:43:13 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* string.c (Init_String): String#taint and String#taint? added.

Wed Sep 24 00:57:00 1997  Katsuyuki Okabe  <HGC02147@niftyserve.or.jp>

	* X68000 patch.

Tue Sep 23 20:42:30 1997  EGUCHI Osamu  <eguchi@shizuokanet.or.jp>

	* parse.y (node_newnode): SEGV on null node setup.

Mon Sep 22 11:22:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* ruby.c (ruby_prog_init): wrong safe condition check.

Sun Sep 21 14:46:02 1997  MAEDA shugo  <shugo@po.aianet.ne.jp>

	* error.c (exc_inspect): garbage added to classpath.

Fri Sep 19 11:49:23 1997    <matz@netlab.co.jp>

	* version 1.0-970919

	* parse.y (newtok): forgot to adjust buffer size when shrinking
	  the token buffer.

	* enum.c (enum_find): rb_eval_cmd() does not return value.

	* io.c (pipe_open): close fds on pipe exec. fcntl(fd, F_SETFD, 1)
	  no longer used.

Tue Sep 16 17:54:25 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* file.c (f_test): problem if wrong command specified.

	* ruby.c (ruby_prog_init): close stdaux and stdprn for MSDOS.

	* ruby.c (ruby_prog_init): should not add path from environment
	  variable, if ruby is running under seuid.

	* process.c (init_ids): check suid check for setuid/seteuid etc.

Mon Sep 15 00:42:04 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* regex.c (re_compile_pattern): \w{3} and \W{3} did not work.

Thu Sep 11 10:31:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970911

	* ext/socket/socket.c (sock_new): no setbuf() for NT.

	* io.c (rb_fopen,rb_fdopen): set close-on-exec for every fd.

Wed Sep 10 15:55:31 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970910

	* ext/marshal/marshal.c (r_bytes0): extra big length check.

Tue Sep  9 16:27:14 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* io.c (pipe_fptr_atexit): clean up popen()'ed fptr.

	* error.c (set_syserr): some system has error code that is bigger
	  than sys_nerr. grrr.

Tue Sep  9 16:27:14 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970909

	* error.c (set_syserr): some system has error code that is bigger
	  than sys_nerr. grrr.

Wed Sep  3 18:11:00 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970903

	* eval.c (f_load): expand path if fname begins with `~'.

Mon Sep  1 13:42:48 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* eval.c (rb_call): alias occured in the module body caused SEGV.

Fri Aug 29 11:10:21 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* parse.y (yylex): spaces can follow =begin/=end.

	* variable.c (find_class_path): look for class_tbl also for
	  unnamed fundamental classes, such as Object, String, etc.

	* variable.c (rb_name_class): can't name class before String class
 	  is initilialized.

	* inits.c (rb_call_inits): unrecognized dependency from GC to
	  Array.

	* variable.c (find_class_path): could not find class if Object's
 	  iv_tbl is NULL.

Thu Aug 28 13:12:05 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* parse.y (yylex): revised `=begin' skip code.

	* eval.c (is_defined): separated from rb_eval().

Wed Aug 27 11:32:42 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* variable.c (fc_i): some classes/modules does not have iv_tbl.

	* variable.c (find_class_path): avoid inifinite loop.

Tue Aug 26 13:43:47 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* eval.c (rb_eval): undef'ing non-existing method will raise
	  NameError exception.

	* object.c (class_s_new): needed to create metaclass too.

	* eval.c (error_print): no class name print for anonymous class.

	* eval.c (rb_longjmp): proper exception raised if raise() called
 	  without arguments, with $! or $@ set.

	* object.c (Init_Object): superclass()'s method argument setting
 	  was wrong again.

Mon Aug 25 11:53:11 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* sample/ruby-mode.el (ruby-parse-region): auto-indent now
 	  supports "\\" in the strings.

	* struct.c (struct_getmember): new API to get member value from C
	  language side.

Fri Aug 22 14:26:40 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* eval.c (error_print): modified exception print format.

Thu Aug 21 16:10:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* sample/ruby-mode.el (ruby-calculate-indent): wrong indent level
	  calculated with keyword operators.

Thu Aug 21 11:55:41 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970821

Thu Aug 21 11:36:58 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* parse.y (arg): ary[0] += 1 cause SEGV

Wed Aug 20 14:24:42 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970820

	* eval.c (rb_call): infinite loop bug

Tue Aug 19 00:15:38 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* version 1.0-970819

	* eval.c (rb_call): did not raise ArgumentError if too many
 	  arguments more than optional arguments (without rest arg).

	* eval.c (rb_eval): did not work well for op_asgn2 (attribute
	  self assignment).

Mon Aug 18 09:25:56 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* object.c (inspect_i): did not display T_DATA instance variables.

	* parse.y: provides more accurate line number information.

	* eval.c (thread_value): include value's backtrace information in
	  the variable `$@'.

	* eval.c (f_abort): print backtrace and exit.

Sat Aug 16 00:17:44 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* object.c (class_s_new): do not make subclass of singleton class.

Fri Aug 15 15:49:46 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* eval.c (call_trace_func): block context switch in the trace
          function.

	* eval.c (rb_eval): clear method cache at class extention.

Fri Aug 15 19:40:43 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* ext/socket/socket.c (Init_socket): small typo caused SEGV.

Tue Aug 12 16:02:18 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* variable.c: option variables: $-0, $-p(readonly), $-v,
	  $-I(load_path), $-a(readonly), $-K, $-d, $-F, $-i, $-l.

	* parse.y (yylex): ignore rd (ruby document) in the code.

Mon Aug 11 12:37:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* re.c (Init_Regexp): $-K as alias to the $KCODE.

	* io.c (Init_IO): new virtual variable $-i for the value of -i
 	  option.

	* enum.c (Init_Enumerable): include? as alias of member?

Fri Aug  8 11:16:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* io.c (io_foreach): now the record separator can be specified.

	* io.c (io_s_readlines): new method to read in whole file (or
 	  command output) from path.

	* ext/socket/socket.c (Init_socket): recvfrom did not work.

	* ext/socket/socket.c (sock_send): forgot to check nil for false
	  value.

Thu Aug  7 11:40:01 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* object.c (Init_Object): remove private_attr/public_attr.

Wed Aug  6 14:21:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* object.c (mod_attr): forgot to check nil for false value.

Mon Aug  4 11:50:28 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* variable.c (rb_class_path): scan class constants for anonymous
	  classes/modules to make up pathes.

Wed Jul 30 08:45:12 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* eval.c (rb_eval): stop to cache const value in nodes.

Sat Jul 26 03:17:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* numeric.c (flo_to_s): wrong .0 at end.

Sat Jul 26 00:36:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* eval.c (error_print): always print exception type in the
 	  toplevel exception handler.

	* string.c (str_hash): wrong hash value.

Thu Jul 24 11:05:51 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>

	* string.c (uscore_get): proper error message for unset $_.

Wed Jul 23 09:56:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* object.c (obj_methods): returns list of method names of the
	  specified object.

	* class.c (mod_instance_methods): returns list of method names of
	  the class instnace.

Fri Jul 11 22:38:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* object.c (class_superclass): returns class's superclass
 	  itself. (1.1)

	* object.c (obj_type): returns object's class itself. (1.1)

	* class.c (mod_included_modules): list included modules.

	* object.c (class_superclass): raises error for Object.

Thu Jul  3 09:54:02 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (SETUP_ARGS): save source position, remove nd_line().

	* eval.c (rb_call): replace modulo by bit-masking.

	* eval.c (POP_SCOPE): force recycle scope object to reduce gc rate.

	* gc.c (obj_free): aboid calling run_final() when no finalizer is set.

	* eval.c (PUSH_VARS): do not allocate the dynamic scope's end-mark
	  object.

Wed Jul  2 14:25:07 1997  KIMURA Koichi  <kkimura@pure.cpdc.canon.co.jp>

	* Native mswin32 support.

Tue Jul  1 09:59:00 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970701

	* parse.y (mrhs): allow rest-star(*) in right hand side.

Tue Jun 24 19:04:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970624

Sat Jun 20 22:22:51 1997  Michio "Karl" Jinbo  <karl@marcer.nagaokaut.ac.jp>

	* eval.c: freebsd 3.0 <sys/select.h> support.

Fri Jun 20 01:24:45 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970620

	* gc.c: eliminate uninitilalized field of Hash, Array etc., to
	  avoid dumping core.

Thu Jun 19 01:29:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970619

	* string.c (str_split_method): wrong limit.

Sat Jun 14 01:54:16 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* class.c (rb_singleton_class): no singleton for special
	  constants (now raises exception).

	* eval.c (ruby_init): cbase in TOPLEVEL_BINDING need to be
	  initialized.

Sat Jun 14 01:01:16 1997  maeda shugo  <shugo@po.aianet.ne.jp>

	* array.c (sort_2): wrong comparison.

Sat Jun 14 00:53:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* hash.c (hash_foreach): safe iteration.

Fri Jun 13 14:04:56 1997  Michio "Karl" Jinbo  <karl@marcer.nagaokaut.ac.jp>

	* configure.in: -Bshareable option for netbsd.

Fri Jun 13 01:16:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* io.c (pipe_open): call io_unbuffered() only for writable pipes.

Thu Jun 12 01:14:15 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970612

	* ext/socket/socket.c (sock_new): use io_unbuffered().

	* ext/marshal/marshal.c (w_long): compact long format, which
	  supports 64 bit architectures (unless longs are >32 bit size).

	* ext/marshal/marshal.c: allows recursive data for marshaling.

	* parse.y (rb_intern): raise exception for non-internable string.

	* ext/marshal/marshal.c (marshal_load): allows direct loading from
 	  strings.

	* ext/marshal/marshal.c (marshal_dump): allows direct dump to strings.

	* ext/marshal/marshal.c (marshal_dump): interface changed.

Wed Jun 11 18:26:00 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* gc.c (rb_newobj): remove needless memset().

Mon Jun  9 13:03:43 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (rb_eval): reduce condition checks from while/until loop.

	* eval.c (rb_eval): wrong jump point for `next'.

Fri Jun  6 11:47:39 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ruby.c (ruby_set_argv): initialize dln_argv0 for dln_a_out.

	* ext/socket/socket.c (open_unix): display path name for exceptions.

	* ruby.c (proc_options): option -S did not work well.

Fri May 30 02:14:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970530

	* eval.c (eval): set $! properly if exception raised in eval().

	* io.c (io_write): now handles non T_FILE object.

	* io.c (io_defset): $< can be anything which has `write' method.

Thu May 29 15:40:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (eval): $@ is always an array (not string).

	* pack.c (pack_unpack): avoid corrupting memory for unexpected
	  input strings.

Wed May 28 12:46:13 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970528

	* process.c (rb_waitpid): do not block other threads.

Tue May 27 12:02:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (ruby_init): split initialize and processing command line
	  options.

	* ruby.c (ruby_options): ruby_init(0, 0, envp) dumps core.

Tue May 20 18:59:45 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* variable.c (rb_ivar_set): invalid instance variable access for
	  built-in object raises TypeError.

Fri May 16 17:32:21 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970516

	* dir.c (push_globs): was freeing non heap pointer.

	* gc.c: remove some duplicated prototypes.

	* ext/kconv/kconv.c: fix prototypes.

Fri May  9 11:38:59 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970509

	* gc.c (obj_free): avoid free(NULL).

	* eval.c (rb_check_safe_str): argument missing for TypeError().

Thu May  8 01:14:28 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* file.c (file_s_dirname): need to return "." for path without
	  slashes.

Wed May  7 19:18:48 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* process.c (f_fork): child processe does not inherit parent's
 	  itimer setting on linux.  call setitimer() again in the child
	  process.

Sat May  3 02:49:43 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ext/curses/curses.c: modified for portability and add to the
 	  standard distribution.

Wed Apr 30 00:34:00 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* file.c (file_s_size): returns 0 for empty files (not FALSE).

Fri Apr 25 02:17:50 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970425

	* eval.c (f_load): free unused name-table.

	* eval.c (f_load): copy local variable name-table.

	* gc.c (obj_free): avoid free(NULL).

	* eval.c (rb_eval): forgot to make link from the scope object to
	  NODE_SCOPE.  It may crash the interpreter.

Thu Apr 24 00:35:09 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* random.c (f_srand): save old seed anyway.  srand() returns no
 	  value on some systems.

	* gc.c (obj_free): avoid double free of the local variable name
	  table.

	* parse.y (top_local_setup): modify realloc to handle offset.

Tue Apr 22 12:58:26 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970422

Thu Apr 17 00:40:51 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* configure.in (rb_cv_bsdpgrp): proper check for BSD
	  setpgrp/setpgrp.

Wed Apr 16 16:14:02 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (proc_call): proc called in other thread must be orphan.

Tue Apr 15 10:46:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970415

	* gc.c (obj_free): NODE_SCOPE marked from SCOPE object.

	* gc.c (gc_mark): some nodes marked wrong.

	* process.c (proc_getpgrp): wrong argument

Fri Apr 14 18:32:42 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970414

Fri Apr 12 01:20:12 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ruby.h: String pointer changed to unsigned char.

Fri Apr 11 10:27:29 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970411

	* Makefile.in: create libruby.a before linking ruby.

	* string.c (str_strip_bang): >0x80 characters for isspace().

	* eval.c (proc_call): set safe-level temporally

	* eval.c (proc_s_new): save safe-level in the proc context.

	* eval.c (rb_eval): no class/module extention in safe mode.

Thu Apr 10 02:10:41 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* gc.c (gc_mark): remove some pointer checks for speeding up.

	* ruby.c (ruby_options): set $0 temporally for -r option.

	* eval.c: built-in security feature.

	* gc.c (gc_sweep): do not free nodes during compile.

	* parse.y (yycompile): set flag when compiling.

Wed Apr  9 10:19:02 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ruby.c: forgot to include <ctype.h> for isspace().

	* file.c: provide S_ISREG for some platforms.

	* io.c (Init_IO): added some $< operations.

	* lib/ping.rb: check host upness using TCP echo.

Tue Apr  8 00:10:15 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* io.c (arg_read): bug with 0 length input.

Mon Apr  7 11:36:16 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ext/fcntl/fcntl.c: module for fcntl constants.

	* eval.c (rb_alias): bug when original was an alias.

	* parse.y (primary): syntax to access singleton class.

	* eval.c (mod_public_method): method's to specify visibitily of
	  the class methods.  make_method_{public,private} removed.

Fri Apr  4 21:43:57 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970404

	* gc.c (obj_free): finalizer added for experiment.

Thu Apr  3 02:12:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (thread_schedule): make Fatal rise on main_thread on
	  deadlocks.

	* eval.c (thread_join): raise ThreadError instead of Fatal, in
	  case of deadlock.

	* regex.c (re_compile_fastmap): uninitialized local variable.

	* parse.y (parse_regx): new option //[nes] to specify character
	  code for regexp literals.  Last specified code option is valid.

	* re.c (reg_s_new): addtional 3rd argument to specify compiled
 	  regexp's character code.

	* re.c (reg_new_1): regexp character code can be specified for
	  each regexp object.

Wed Apr  2 14:51:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (thread_create): handle uncaught throw.

	* eval.c (thread_create): halt on some deadlock conditions.

	* regex.c (is_in_list): wrong result for non-mbc higher-byte
	  characters.

	* regex.c (re_match): wrong skip for multi-byte characters.

	* regex.c (re_compile_fastmap): wrong fastmap in non-mbc mode.

	* hash.c (Init_Hash): hash compatible features added to ENV.

Tue Apr  1 15:24:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (obj_extend): remove Object#extend as an iterator which
 	  is in experimental state, since it unveils internal singleton
 	  classes.

Mon Mar 31 14:29:39 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970331

Sun Mar 30 19:40:57 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* parse.y (terms): avoided win32 gcc's optimization bug.

Sat Mar 29 11:21:58 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* struct.c (make_struct): St[val,..] creates new structure.

Fri Mar 28 11:24:51 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (obj_make_private): new method make_method_{public,private}
	  to change visibility of singleton methods.

	* regex.c (re_compile_pattern): enables numeric literal >= 0x80 in
	  the character class.

	* regex.c (re_compile_pattern): enabled numeric literal >= 0x80,
	  in multibyte mode.

	* regex.c (re_compile_fastmap): modified exantn and charset(_not)
	  to set fastmap for higher bytes properly.

	* regex.c (is_in_list): now matches numeric literals.

Thu Mar 27 13:34:20 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* pack.c (pack_unpack): extra null byte after unpacked string.

Wed Mar 26 15:20:34 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* regex.c (re_compile_pattern): register numbers must be fit in a
 	  byte (0 <= regnum <= 0xff).

	* regex.c (re_compile_fastmap): forgot to set mbchar map for
 	  charset_not if RE_MBCTYPE is on.

	* regex.c (re_compile_pattern): set list bits for multi-byte
	  characters for \W, \S, \D in range expression.

	* object.c (obj_is_kind_of): defined that nil itself is kind of
 	  nil.  TRUE is kind of TRUE, FALSE is kind of FALSE likewise.
  	  This change makes `obj.kind_of?(eval(obj.type))' always true.

Tue Mar 25 14:08:43 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* lib/English.rb: provides nicer English alias for the variables.

	* parse.y (expr): alias $var1 $var2 makes alias of the global
	  variable.

Mon Mar 24 18:23:20 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970324

Thu Mar 20 22:04:59 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (mod_modfunc): forget to clear method cache.

Wed Mar 19 17:06:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* parse.y (program): set methods' default private/public status
	  correctly under eval().

	* eval.c (eval): set the_class correctly while evaluating string.

Tue Mar 18 12:23:53 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (eval): yield can be called from eval().

	* version 1.0-970318

	* parse.y (program): regexp in condition expression should do
	  matching operation with $_.

	* re.c (reg_regsub): wrong substitution.

Fri Mar 14 14:36:28 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* hash.c (hash_invert): returns value to key mapping of the
	  associative array.

	* ext/socket/extconf.rb: set environment variable SOCKS_SERVER to
	  compile with libsocks.a.

	* ext/socket/socket.c (socks_s_open): SOCKSsocket class to access
	  internet via SOCKS library.

	* sprintf.c (f_sprintf): unsigned formats display leading double
 	  dots for imaginary sequence of signed bit to the left.

	* sprintf.c (f_sprintf): correct width and precision formatting
	  for big integers.

	* parse.y (yylex): enables negative hex/octal numbers and `_' in
	  non-decimal numbers.

	* sprintf.c (f_sprintf): %u added for unsigned decimal format.

Thu Mar 13 10:24:27 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* sprintf.c (f_sprintf): wrong output for bignums.

	* array.c (ary_reverse_each): iterates in reverse order.

	* pack.c (pack_unpack): L unpacked signed long.

	* io.c (f_backquote): now returns an empty string for no output.

Wed Mar 12 10:20:30 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ext/socks/socks.c: socket module with socks library.

Mon Mar 10 20:44:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* re.c (reg_regsub): \& for substitution.  \`, \', and \+ are
	  avaiable also.

Thu Mar  6 01:47:03 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970306

	* sample/rubydb.el (gud): ruby debugger emacs interface

	* lib/debug.rb: ruby debugger

	* parse.y (exprs): more accurate line number display.

Wed Mar  5 21:31:46 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970305

Tue Mar  4 12:28:32 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ruby.c (proc_options): search through RUBYPATH and PATH for
	  option -S.

Mon Mar  3 22:44:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (thread_status): returns nil for exception terminated
	  threads.

	* eval.c (thread_value): re-raise exceptions.

Sat Mar  1 00:59:47 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (rb_eval): restore $! value after rescue clause, to
	  re-raise exceptions correctly.

Fri Feb 28 16:43:38 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970228

Thu Feb 27 11:23:41 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (rb_yield_0): redo raises exception

	* eval.c (thread_schedule): bug in interrupt handling by rescue.

Wed Feb 26 00:55:36 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (eval): forgot to restore dynamic local variable
	  bindings.

Tue Feb 25 11:22:08 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ext/aix_ld.rb: AIX dynamic load support (not tested).

	* eval.c (rb_eval): wrong return value for defined? super.

	* error.c (exception): more error check.

	* re.c (reg_regsub): wrong substitution when sub expanded to null
 	  string.

Fri Feb 21 13:01:47 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970221

	* eval.c (f_require): volatile added.  register variable was
 	  recycled, so that GC did not mark that variable.

	* object.c (Init_Object): forget to mark main object (was mostly
	  ok, but made trouble with early GC.)

Thu Feb 20 11:50:50 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970220

Thu Feb 20 11:25:50 1997  Yasuo OHBA  <jammy@shljapan.co.jp>

	* lib/date.rb: update

Thu Feb 20 08:25:57 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* parse.y (yylex): forgot tokfix() before rb_intern().

	* lib/tk.rb (TkVariable): give up using trace_var.

Wed Feb 19 00:24:35 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970219

	* pack.c (pack_pack): packed by null for A specifier. must be
	  space filled.

	* pack.c (pack_unpack): bug in skipping spaces

	* gc.c (xmalloc): garbage collect for every 4 Meg. allocation.

	* string.c (str_split_method): limit worked wrong way.

	* io.c (io_gets_method): misunderstand 0xff in binary files when
	  $/ == nil.

	* re.c (reg_regsub): re-implement.

	* ext/socket/socket.c (thread_connect): remove O_NONBLOCK, which
	  is not defined on some platform like NeXT.

Mon Feb 17 13:08:30 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970217

	* object.c (mod_eqq): === extended for subclass check (to use case
	  as typecase).

Sat Feb 15 02:07:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* regex.c (re_compile_pattern): wrong match backref at end of pattern.

	* io.c (arg_read): now works beyond end of file.

Thu Feb 13 16:21:24 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* parse.y (expr): return/yield now accept normal argument format.

	* parse.y (yylex): a star in `yield *x' must not be multiplication
	  operator.

Wed Feb 12 15:06:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* time.c (time_plus): bug in simple addition.

	* eval.c (thread_raise): raise exceptions from outside.

	* eval.c (Init_Thread): Thread#alive? -- alias for Thread#status.

Mon Feb 10 00:38:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* ruby.h (Data_Make_Struct): rename macros.

Sun Feb  8 11:48:13 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* io.c (f_syscall): argument offset was wrong.

Fri Feb  7 18:01:17 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970207

	* eval.c: add volatiles to avoid variable crobbering by longjmp().

	* eval.c (f_raise): 1st argument can be the GlobalExit object now.

	* array.c (ary_unshift): no longer accept more than 2 args.

	* eval.c (f_raise): bug if 2nd argument is the exception.

Tue Feb  4 00:37:29 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970204

	* eval.c (eval): check compile errors by nerrs.

	* eval.c (rb_eval): check syntax error by nerrs, not by the return
 	  value, which may be NULL.

	* eval.c (compile): Do not clear errinfo.

Mon Feb  3 10:13:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (obj_extend): move real inclusion to Module#extend_object
	  to allow redfinition.

	* object.c (Init_Object): Kernel class is now Module. Object class
	  became the true root class.

	* object.c (obj_inspect): remove useless buffer.

	* hash.c (any_cmp): disable interrupts and context switching.

	* st.c: remove ALLOW_INTS to disable interrupt during operations.

Fri Jan 31 22:10:08 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* hash.c (hash_rehash): re-register all key-value.

Thu Jan 30 02:14:49 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* io.c (io_reopen): re-implement according to clone() way.

	* io.c (io_clone): copy IO object.

	* struct.c (struct_eql): compare elements by eql?.

	* io.c (io_mode_flags): detect "rb", "wb" etc.

	* io.h (FMODE_BINMODE): added.

	* ext/socket/socket.c (Init_socket): undef BasicSocket.new

	* file.c (Init_File): File.new(path[,mode])

	* io.c (Init_IO): IO.new(fd[,mode])

	* eval.c (rb_method_boundp): forgot to enable priv argument.

	* object.c (Init_Object): remove `=~' from Kernel class.

	* ext/socket/socket.c (open_inet): initialize sockaddr before
	  calling bind(2).

	* sample/ruby-mode.el (ruby-calculate-indent): skip comment lines

Wed Jan 29 18:43:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (Init_Thread): DEFER_INTS during initializing threads.

	* hash.c (Init_Hash): Hash#eql? checks for object identity.

	* eval.c (thread_set_critical): wrong value assigned.

Mon Jan 27 16:10:51 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* io.c (io_print): remove print_on().

	* eval.c (f_missing): proper error message for undefined method
	  without argument

Sat Jan 25 23:32:32 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* string.c (str_sub_s): false alert - sub() does not modify string.

	* array.c (ary_times): negative multiplication detected

	* string.c (str_times): negative multiplication detected

Fri Jan 24 10:51:39 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* time.c (time_arg): month -> 0 == "jan" == "1" == "01", little bit
	  confusing but wanted to conform japanese style.

	* version 1.0-970124

Fri Jan 24 09:52:49 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* util.c (_fixpath): supports SJIS filenames on DJGPP.

Thu Jan 23 16:52:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* README.EXT: update. partially translated into English.

	* ext/extmk.rb.in: inherit $LDFLAGS to the final link.

	* ext/socket/socket.c (Init_socket): add various constants.

Mon Jan 23 11:40:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* eval.c (Init_Thread): allocate main_thread first to avoid crash.

Thu Jan 23 02:09:26 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* gc.c (ObjectSpace): API modified. each_object method will do all
 	  the iteration.

	* eval.c (proc_call): wrong return from nested lambda.

	* ext/GD/GD.c: debugged.

Wed Jan 22 16:12:25 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970122

	* gc.c (gc_mark): forgot to mark match->str.

	* ext/GD/GD.c: GD interface module.

	* eval.c (PUSH_BLOCK): wrong value pushed as the block level.

Mon Jan 20 14:01:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (thread_run): no context switch in the critical section.

Mon Jan 20 09:40:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>

	* utils.c: supports 8+3 filenames

Sat Jan 18 01:23:03 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970118

	* regex.c (PATFETCH): need cast to unsigned char.

	* io.c (io_ctl): bug in case when arg is not a string.

	* lib/tk.rb: forgot that Kernel#type returns the class name now.

	* regex.c (re_search): "abc\n" =~ "^$" should not match.

Fri Jan 17 12:31:37 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970117

	* ruby.c (ruby_options): constant PLATFORM, which is in the {cpu}-{os}
	  form, defined.

	* configure.in: platform infomation embedded in the interpreter.

	* regex.c (re_search): /^$/ did not match to "" by wrong exit condition.

	* lib/thread.rb: re-write Mutex/Queue based on Thread.critical.

	* eval.c (thread_set_critical): remove Thread.exclusive, add
	  Thread.critical = TRUE/FALSE instead.

	* re.c (reg_search): re-compile pattern if needed

	* regex.c (PATFETCH): do translate at compile time

Thu Jan 16 00:49:10 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* gc.c (gc_mark_frame): forgot to mark frame->cbase.

	* regex.c (re_compile_pattern): /a$|b)/ causes error.

	* regex.c (re_compile_pattern): /(^|b)/ causes error.

	* version 1.0-970116

	* re.c (Init_Regexp): set RE_CONTEXTUAL_INVALID_OPS flag.

Tue Jan 14 02:09:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (proc_call): Proc#callをイテレータとして呼んだ時に対応

	* configure.in: nextstep対応？

	* eval.c (rb_eval): a[b]=cで無駄な配列を割り当てない

	* eval.c (f_send): イテレータとして呼ばれたらイテレータとしてメソッ
	  ドを呼ぶ．

	* string.c (str_new4): match共有用の生成関数

	* re.c (reg_search): matchの実体(文字列)をマッチを行った文字列と
	  copy-on-writeで共有

	* string.c (str_hash): toupperをかける条件が違っていた

	* array.c (sort_2): FixnumとStringを特別扱いして高速化

Mon Jan 13 11:03:53 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* eval.c (thread_create): threadが生成されるまで割込みを設定しない

	* eval.c (Init_Thread): 割込みタイミングを100msecに

Sat Jan 11 00:17:05 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* regex.c (re_search): マッチに失敗する場合があった(本当に直ったか？)

	* io.c (io_ioctl,io_fcntl): 第2引数を省略可能に

	* io.c (io_ioctl,io_fcntl): 戻り値がIOだった．整数(システムコール
	  の戻り値)を返すようにした．

	* io.c (io_ctl): 引数が整数の時に対応

	* io.c (io_fcntl): file.cから移動

Fri Jan 10 17:01:47 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* version 1.0-970110

	* ext/socket/socket.c (thread_connect): open(connect(2))で他の
	  threadをブロックしないように

	* eval.c (thread_create): exitでないときにexitだと思い込む

Mon Jan  6 17:42:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* string.c (str_sub_s): 文字列長より長いoffsetの検出

	* regex.c (re_search): 空にマッチするパターン後の$で失敗

Thu Jan  2 16:36:23 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* file.c (file_reopen): Fileのreopen(pathまたはIOで指定)．

	* io.c (io_reopen): IOのreopen(IOで指定) -- change classつき

Wed Jan  1 11:09:01 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* io.c (f_select): timeoutでnilを返す

Fri Dec 27 13:06:44 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* file.c (file_s_open): サブクラスではそのクラスのインスタンスを返
	  すように．

Fri Dec 27 08:58:27 1996  ono@isl.nara.sharp.co.jp

	* numeric.c (flo_to_s): index()を使わない．strstr()に．

Thu Dec 26 01:34:17 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>

	* lib/tk.rb: placeが使えるように

	* pack.c (endian): マクロDYNAMIC_ENDIANを指定すると実行時にendian
	  を判定するように．

	* eval.c (thread_alloc): 初期化忘れのメンバがあった．

Co-authored-by: EGUCHI Matsumoto <eguchi@shizuokanet.or.jp>
Co-authored-by: EGUCHI Osamu <eguchi@shizuokanet.or.jp>
Co-authored-by: KIMURA Koichi <kkimura@pure.cpdc.canon.co.jp>
Co-authored-by: Katsuyuki Okabe <HGC02147@niftyserve.or.jp>
Co-authored-by: MAEDA shugo <shugo@po.aianet.ne.jp>
Co-authored-by: Michio "Karl" Jinbo <karl@marcer.nagaokaut.ac.jp>
Co-authored-by: WATANABE Hirofumi <watanabe@ase.ptg.sony.co.jp>
Co-authored-by: Yasuo OHBA <jammy@shljapan.co.jp>
Co-authored-by: maeda shugo <shugo@po.aianet.ne.jp>
Co-authored-by: ono <ono@isl.nara.sharp.co.jp>

1 files changed, 440 insertions, 148 deletions

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 6b4f0f5559..be9118d0a8 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -20,6 +20,18 @@
 #include <sys/un.h>
 #endif
 
+#if defined(THREAD) && defined(HAVE_FCNTL)
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+#include <sys/types.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#endif
+#ifndef EWOULDBLOCK
+#define EWOULDBLOCK EAGAIN
+#endif
+
 extern VALUE cIO;
 extern VALUE cInteger;
 
@@ -35,9 +47,19 @@ VALUE cSocket;
 extern VALUE eException;
 static VALUE eSocket;
 
+#ifdef SOCKS
+VALUE cSOCKSsocket;
+void SOCKSinit();
+int Rconnect();
+#endif
+
 FILE *rb_fdopen();
 char *strdup();
 
+#define INET_CLIENT 0
+#define INET_SERVER 1
+#define INET_SOCKS  2
+
 #ifdef NT
 static void
 sock_finalize(fptr)
@@ -60,13 +82,15 @@ sock_new(class, fd)
     OBJSETUP(sock, class, T_FILE);
 
     MakeOpenFile(sock, fp);
+    fp->f = rb_fdopen(fd, "r");
 #ifdef NT
     fp->finalize = sock_finalize;
-#endif
-    fp->f = rb_fdopen(fd, "r");
+#else
     setbuf(fp->f, NULL);
+#endif
     fp->f2 = rb_fdopen(fd, "w");
-    fp->mode = FMODE_READWRITE|FMODE_SYNC;
+    fp->mode = FMODE_READWRITE;
+    io_unbuffered(fp);
 
     return (VALUE)sock;
 }
@@ -106,6 +130,7 @@ bsock_setsockopt(sock, lev, optname, val)
     char *v;
     int vlen;
 
+    rb_secure(2);
     level = NUM2INT(lev);
     option = NUM2INT(optname);
     switch (TYPE(val)) {
@@ -136,26 +161,20 @@ static VALUE
 bsock_getsockopt(sock, lev, optname)
     VALUE sock, lev, optname;
 {
-#if !defined(__CYGWIN32__)
     int level, option, len;
-    struct RString *val;
+    char *buf;
     OpenFile *fptr;
 
     level = NUM2INT(lev);
     option = NUM2INT(optname);
     len = 256;
-    val = (struct RString*)str_new(0, len);
-    Check_Type(val, T_STRING);
+    buf = ALLOCA_N(char,len);
 
     GetOpenFile(sock, fptr);
-    if (getsockopt(fileno(fptr->f), level, option, val->ptr, &len) < 0)
+    if (getsockopt(fileno(fptr->f), level, option, buf, &len) < 0)
 	rb_sys_fail(fptr->path);
-    val->len = len;
 
-    return (VALUE)val;
-#else
-    rb_notimplement();
-#endif
+    return str_new(buf, len);
 }
 
 static VALUE
@@ -187,9 +206,210 @@ bsock_getpeername(sock)
 }
 
 static VALUE
-open_inet(class, h, serv, server)
+bsock_send(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    struct RString *msg, *to;
+    VALUE flags;
+    OpenFile *fptr;
+    FILE *f;
+    int fd, n;
+
+    rb_secure(4);
+    rb_scan_args(argc, argv, "21", &msg, &flags, &to);
+
+    Check_Type(msg, T_STRING);
+
+    GetOpenFile(sock, fptr);
+    f = fptr->f2?fptr->f2:fptr->f;
+    fd = fileno(f);
+  retry:
+#ifdef THREAD
+    thread_fd_writable(fd);
+#endif
+    if (RTEST(to)) {
+	Check_Type(to, T_STRING);
+	n = sendto(fd, msg->ptr, msg->len, NUM2INT(flags),
+		   (struct sockaddr*)to->ptr, to->len);
+    }
+    else {
+	n = send(fd, msg->ptr, msg->len, NUM2INT(flags));
+    }
+    if (n < 0) {
+	switch (errno) {
+	  case EINTR:
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+#ifdef THREAD
+	    thread_schedule();
+#endif
+	    goto retry;
+	}
+	rb_sys_fail("send(2)");
+    }
+    return INT2FIX(n);
+}
+
+static VALUE tcpaddr _((struct sockaddr_in*));
+#ifdef HAVE_SYS_UN_H
+static VALUE unixaddr _((struct sockaddr_un*));
+#endif
+
+static VALUE
+s_recv(sock, argc, argv, from)
+    VALUE sock;
+    int argc;
+    VALUE *argv;
+    int from;			/* 0 - recv,
+				   1 - TCPsocket#recvfrom,
+				   2 - UNIXsocket#recvfrom,
+				   3 - Socket#recvfrom */
+{
+    OpenFile *fptr;
+    FILE f;
+    struct RString *str;
+    char buf[1024];
+    int fd, alen = sizeof buf;
+    VALUE len, flg;
+    int flags;
+
+    rb_scan_args(argc, argv, "11", &len, &flg);
+
+    if (flg == Qnil) flags = 0;
+    else             flags = NUM2INT(flg);
+
+    str = (struct RString*)str_new(0, NUM2INT(len));
+
+    GetOpenFile(sock, fptr);
+    fd = fileno(fptr->f);
+#ifdef THREAD
+    thread_wait_fd(fd);
+#endif
+    TRAP_BEG;
+  retry:
+    str->len = recvfrom(fd, str->ptr, str->len, flags,
+			(struct sockaddr*)buf, &alen);
+    TRAP_END;
+
+    if (str->len < 0) {
+	switch (errno) {
+	  case EINTR:
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+#ifdef THREAD
+	    thread_schedule();
+#endif
+	    goto retry;
+	}
+	rb_sys_fail("recvfrom(2)");
+    }
+    str_taint(str);
+    switch (from) {
+      case 0:
+	return (VALUE)str;
+      case 1:
+	if (alen != sizeof(struct sockaddr_in)) {
+	    TypeError("sockaddr size differs - should not happen");
+	}
+	return assoc_new(str, tcpaddr((struct sockaddr_in *)buf));
+#ifdef HAVE_SYS_UN_H
+      case 2:
+	if (alen != sizeof(struct sockaddr_un)) {
+	    TypeError("sockaddr size differs - should not happen");
+	}
+	return assoc_new(str, unixaddr((struct sockaddr_un *)buf));
+#endif
+      case 3:
+	return assoc_new(str, str_new(buf, alen));
+    }
+}
+
+static VALUE
+bsock_recv(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recv(sock, argc, argv, 0);
+}
+
+#if defined(THREAD) && defined(HAVE_FCNTL)
+static int
+thread_connect(fd, sockaddr, len, type)
+    int fd;
+    struct sockaddr *sockaddr;
+    int len;
+    int type;
+{
+    int status;
+    int mode;
+    fd_set fds;
+
+    mode = fcntl(fd, F_GETFL, 0);
+
+#ifdef O_NDELAY 
+# define NONBLOCKING O_NDELAY
+#else
+#ifdef O_NBIO
+# define NONBLOCKING O_NBIO
+#else
+# define NONBLOCKING O_NONBLOCK
+#endif
+#endif
+    fcntl(fd, F_SETFL, mode|NONBLOCKING);
+    for (;;) {
+#ifdef SOCKS
+	if (type == INET_SOCKS) {
+	    status = Rconnect(fd, sockaddr, len);
+	}
+	else
+#endif
+	{
+	    status = connect(fd, sockaddr, len);
+	}
+	if (status < 0) {
+	    switch (errno) {
+#ifdef EINPROGRESS
+	      case EINPROGRESS:
+#ifdef EAGAIN
+	      case EAGAIN:
+#endif
+		FD_ZERO(&fds);
+		FD_SET(fd, &fds);
+		thread_select(fd+1, 0, &fds, 0, 0, 0);
+		continue;
+#endif
+
+#ifdef EISCONN
+	      case EISCONN:
+#endif
+#ifdef EALREADY
+	      case EALREADY:
+#endif
+#if defined(EISCONN) || defined(EALREADY)
+		status = 0;
+		errno = 0;
+		break;
+#endif
+	    }
+	}
+	mode &= ~NONBLOCKING;
+	fcntl(fd, F_SETFL, mode);
+	return status;
+    }
+}
+#endif
+
+static VALUE
+open_inet(class, h, serv, type)
     VALUE class, h, serv;
-    int server;
+    int type;
 {
     char *host;
     struct hostent *hostent, _hostent;
@@ -203,13 +423,13 @@ open_inet(class, h, serv, server)
     VALUE sock;
 
     if (h) {
-	Check_Type(h, T_STRING);
+	Check_SafeStr(h);
 	host = RSTRING(h)->ptr;
 	hostent = gethostbyname(host);
 	if (hostent == NULL) {
 	    hostaddr = inet_addr(host);
 	    if (hostaddr == -1) {
-		if (server && !strlen(host))
+		if (type == INET_SERVER && !strlen(host))
 		    hostaddr = INADDR_ANY;
 		else {
 #ifdef HAVE_HSTRERROR
@@ -252,6 +472,7 @@ open_inet(class, h, serv, server)
 
     fd = socket(PF_INET, SOCK_STREAM, protoent->p_proto);
 
+    memset(&sockaddr, 0, sizeof(sockaddr));
     sockaddr.sin_family = AF_INET;
     if (h) {
 	memcpy((char *)&(sockaddr.sin_addr.s_addr),
@@ -263,12 +484,27 @@ open_inet(class, h, serv, server)
     }
     sockaddr.sin_port = servent->s_port;
 
-    if (server) {
+    if (type == INET_SERVER) {
+	status = 1;
+	setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,(char*)&status,sizeof(status));
 	status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
 	syscall = "bind(2)";
     }
     else {
-        status = connect(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
+#if defined(THREAD) && defined(HAVE_FCNTL)
+        status = thread_connect(fd, (struct sockaddr*)&sockaddr,
+				sizeof(sockaddr), type);
+#else
+#ifdef SOCKS
+	if (type == INET_SOCKS) {
+	    status = Rconnect(fd, &sockaddr, sizeof(sockaddr));
+	}
+	else
+#endif
+	{
+	    status = connect(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
+	}
+#endif
 	syscall = "connect(2)";
     }
 
@@ -276,7 +512,7 @@ open_inet(class, h, serv, server)
 	close (fd);
 	rb_sys_fail(syscall);
     }
-    if (server) listen(fd, 5);
+    if (type == INET_SERVER) listen(fd, 5);
 
     /* create new instance */
     sock = sock_new(class, fd);
@@ -288,10 +524,27 @@ static VALUE
 tcp_s_open(class, host, serv)
     VALUE class, host, serv;
 {
-    Check_Type(host, T_STRING);
-    return open_inet(class, host, serv, 0);
+    Check_SafeStr(host);
+    return open_inet(class, host, serv, INET_CLIENT);
 }
 
+#ifdef SOCKS
+static VALUE
+socks_s_open(class, host, serv)
+    VALUE class, host, serv;
+{
+    static init = 0;
+
+    if (init == 0) {
+	SOCKSinit("ruby");
+	init = 1;
+    }
+	
+    Check_SafeStr(host);
+    return open_inet(class, host, serv, INET_SOCKS);
+}
+#endif
+
 static VALUE
 tcp_svr_s_open(argc, argv, class)
     int argc;
@@ -301,9 +554,9 @@ tcp_svr_s_open(argc, argv, class)
     VALUE arg1, arg2;
 
     if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2)
-	return open_inet(class, arg1, arg2, 1);
+	return open_inet(class, arg1, arg2, INET_SERVER);
     else
-	return open_inet(class, 0, arg1, 1);
+	return open_inet(class, 0, arg1, INET_SERVER);
 }
 
 static VALUE
@@ -323,7 +576,17 @@ s_accept(class, fd, sockaddr, len)
     fd2 = accept(fd, sockaddr, len);
     TRAP_END;
     if (fd2 < 0) {
-	if (errno == EINTR) goto retry;
+	switch (errno) {
+	  case EINTR:
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+#ifdef THREAD
+	    thread_schedule();
+#endif
+	    goto retry;
+	}
 	rb_sys_fail(0);
     }
     return sock_new(class, fd2);
@@ -352,30 +615,28 @@ open_unix(class, path, server)
 {
     struct sockaddr_un sockaddr;
     int fd, status;
-    char *syscall;
     VALUE sock;
     OpenFile *fptr;
 
-    Check_Type(path, T_STRING);
+    Check_SafeStr(path);
     fd = socket(PF_UNIX, SOCK_STREAM, 0);
     if (fd < 0) rb_sys_fail("socket(2)");
 
+    memset(&sockaddr, 0, sizeof(sockaddr));
     sockaddr.sun_family = AF_UNIX;
     strncpy(sockaddr.sun_path, path->ptr, sizeof(sockaddr.sun_path)-1);
     sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
 
     if (server) {
         status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
-	syscall = "bind(2)";
     }
     else {
         status = connect(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
-	syscall = "connect(2)";
     }
 
     if (status < 0) {
-	close (fd);
-	rb_sys_fail(syscall);
+	close(fd);
+	rb_sys_fail(sockaddr.sun_path);
     }
 
     if (server) listen(fd, 5);
@@ -397,8 +658,6 @@ setipaddr(name, addr)
     char ch;
     struct hostent *hp;
     long x;
-    unsigned char *a;
-    char buf[16];
 
     if (name[0] == 0) {
 	addr->sin_addr.s_addr = INADDR_ANY;
@@ -496,6 +755,15 @@ tcp_peeraddr(sock)
 }
 
 static VALUE
+tcp_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recv(sock, argc, argv, 1);
+}
+
+static VALUE
 tcp_s_getaddress(obj, host)
     VALUE obj, host;
 {
@@ -547,6 +815,15 @@ unix_svr_s_open(class, path)
 }
 
 static VALUE
+unix_recvfrom(argc, argv, sock)
+    int argc;
+    VALUE *argv;
+    VALUE sock;
+{
+    return s_recv(sock, argc, argv, 2);
+}
+
+static VALUE
 unix_accept(sock)
     VALUE sock;
 {
@@ -685,7 +962,7 @@ static VALUE
 sock_s_socketpair(class, domain, type, protocol)
     VALUE class, domain, type, protocol;
 {
-#if !defined(__CYGWIN32__)
+#if !defined(__CYGWIN32__) && !defined(NT)
     int fd;
     int d, t, sp[2];
 
@@ -710,8 +987,21 @@ sock_connect(sock, addr)
     str_modify(addr);
 
     GetOpenFile(sock, fptr);
-    if (connect(fileno(fptr->f), (struct sockaddr*)addr->ptr, addr->len) < 0)
+  retry:
+    if (connect(fileno(fptr->f), (struct sockaddr*)addr->ptr, addr->len) < 0) {
+	switch (errno) {
+	  case EINTR:
+	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+	  case EAGAIN:
+#endif
+#ifdef THREAD
+	    thread_schedule();
+#endif
+	    goto retry;
+	}
 	rb_sys_fail("connect(2)");
+    }
 
     return INT2FIX(0);
 }
@@ -747,114 +1037,27 @@ sock_listen(sock, log)
 }
 
 static VALUE
-sock_accept(sock)
-   VALUE sock;
-{
-    OpenFile *fptr;
-    VALUE addr, sock2;
-    char buf[1024];
-    int len = sizeof buf;
-
-    GetOpenFile(sock, fptr);
-    sock2 = s_accept(cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
-
-    return assoc_new(sock2, str_new(buf, len));
-}
-
-static VALUE
-sock_send(argc, argv, sock)
+sock_recvfrom(argc, argv, sock)
     int argc;
     VALUE *argv;
     VALUE sock;
 {
-    struct RString *msg, *to;
-    VALUE flags;
-    OpenFile *fptr;
-    FILE *f;
-    int fd, n;
-
-    rb_scan_args(argc, argv, "21", &msg, &flags, &to);
-
-    Check_Type(msg, T_STRING);
-
-    GetOpenFile(sock, fptr);
-    f = fptr->f2?fptr->f2:fptr->f;
-    fd = fileno(f);
-#ifdef THREAD
-    thread_fd_writable(fd);
-#endif
-    if (to) {
-	Check_Type(to, T_STRING);
-	n = sendto(fd, msg->ptr, msg->len, NUM2INT(flags),
-		   (struct sockaddr*)to->ptr, to->len);
-    }
-    else {
-	n = send(fd, msg->ptr, msg->len, NUM2INT(flags));
-    }
-    if (n < 0) {
-	rb_sys_fail("send(2)");
-    }
-    return INT2FIX(n);
+    return s_recv(sock, argc, argv, 3);
 }
 
 static VALUE
-s_recv(sock, argc, argv, from)
-    VALUE sock;
-    int argc;
-    VALUE *argv;
-    int from;
+sock_accept(sock)
+   VALUE sock;
 {
     OpenFile *fptr;
-    FILE f;
-    struct RString *str;
+    VALUE addr, sock2;
     char buf[1024];
-    int fd, alen = sizeof buf;
-    VALUE len, flg;
-    int flags;
-
-    rb_scan_args(argc, argv, "11", &len, &flg);
-
-    if (flg == Qnil) flags = 0;
-    else             flags = NUM2INT(flg);
-
-    str = (struct RString*)str_new(0, NUM2INT(len));
+    int len = sizeof buf;
 
     GetOpenFile(sock, fptr);
-    fd = fileno(fptr->f);
-#ifdef THREAD
-    thread_wait_fd(fd);
-#endif
-    TRAP_BEG;
-    str->len = recvfrom(fd, str->ptr, str->len, flags,
-			(struct sockaddr*)buf, &alen);
-    TRAP_END;
-
-    if (str->len < 0) {
-	rb_sys_fail("recvfrom(2)");
-    }
-
-    if (from)
-	return assoc_new(str, str_new(buf, alen));
-    else
-	return (VALUE)str;
-}
-
-static VALUE
-sock_recv(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    return s_recv(sock, argc, argv, 0);
-}
+    sock2 = s_accept(cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
 
-static VALUE
-sock_recvfrom(argc, argv, sock)
-    int argc;
-    VALUE *argv;
-    VALUE sock;
-{
-    return s_recv(sock, argc, argv, 1);
+    return assoc_new(sock2, str_new(buf, len));
 }
 
 #ifdef HAVE_GETHOSTNAME
@@ -951,6 +1154,7 @@ sock_s_gethostbyname(obj, host)
     return mkhostent(h);
 }
 
+static VALUE
 sock_s_gethostbyaddr(argc, argv)
     int argc;
     VALUE *argv;
@@ -999,17 +1203,19 @@ sock_s_getservbyaname(argc, argv)
     return INT2FIX(port);
 }
 
-Init_socket ()
+Init_socket()
 {
     eSocket = rb_define_class("SocketError", eException);
 
     cBasicSocket = rb_define_class("BasicSocket", cIO);
-    rb_undef_method(cBasicSocket, "new");
+    rb_undef_method(CLASS_OF(cBasicSocket), "new");
     rb_define_method(cBasicSocket, "shutdown", bsock_shutdown, -1);
     rb_define_method(cBasicSocket, "setsockopt", bsock_setsockopt, 3);
     rb_define_method(cBasicSocket, "getsockopt", bsock_getsockopt, 2);
     rb_define_method(cBasicSocket, "getsockname", bsock_getsockname, 0);
     rb_define_method(cBasicSocket, "getpeername", bsock_getpeername, 0);
+    rb_define_method(cBasicSocket, "send", bsock_send, -1);
+    rb_define_method(cBasicSocket, "recv", bsock_recv, -1);
 
     cTCPsocket = rb_define_class("TCPsocket", cBasicSocket);
     rb_define_singleton_method(cTCPsocket, "open", tcp_s_open, 2);
@@ -1017,6 +1223,13 @@ Init_socket ()
     rb_define_method(cTCPsocket, "addr", tcp_addr, 0);
     rb_define_method(cTCPsocket, "peeraddr", tcp_peeraddr, 0);
     rb_define_singleton_method(cTCPsocket, "getaddress", tcp_s_getaddress, 1);
+    rb_define_method(cTCPsocket, "recvfrom", tcp_recvfrom, -1);
+
+#ifdef SOCKS
+    cSOCKSsocket = rb_define_class("SOCKSsocket", cTCPsocket);
+    rb_define_singleton_method(cSOCKSsocket, "open", socks_s_open, 2);
+    rb_define_singleton_method(cSOCKSsocket, "new", socks_s_open, 2);
+#endif
 
     cTCPserver = rb_define_class("TCPserver", cTCPsocket);
     rb_define_singleton_method(cTCPserver, "open", tcp_svr_s_open, -1);
@@ -1030,6 +1243,7 @@ Init_socket ()
     rb_define_method(cUNIXsocket, "path", unix_path, 0);
     rb_define_method(cUNIXsocket, "addr", unix_addr, 0);
     rb_define_method(cUNIXsocket, "peeraddr", unix_peeraddr, 0);
+    rb_define_method(cUNIXsocket, "recvfrom", unix_recvfrom, -1);
 
     cUNIXserver = rb_define_class("UNIXserver", cUNIXsocket);
     rb_define_singleton_method(cUNIXserver, "open", unix_svr_s_open, 1);
@@ -1047,9 +1261,7 @@ Init_socket ()
     rb_define_method(cSocket, "listen", sock_listen, 1);
     rb_define_method(cSocket, "accept", sock_accept, 0);
 
-    rb_define_method(cSocket, "send", sock_send, -1);
-    rb_define_method(cSocket, "recv", sock_recv, -1);
-    rb_define_method(cSocket, "recvfrom", sock_recv, -1);
+    rb_define_method(cSocket, "recvfrom", sock_recvfrom, -1);
 
     rb_define_singleton_method(cSocket, "socketpair", sock_s_socketpair, 3);
     rb_define_singleton_method(cSocket, "pair", sock_s_socketpair, 3);
@@ -1059,12 +1271,29 @@ Init_socket ()
     rb_define_singleton_method(cSocket, "getservbyname", sock_s_getservbyaname, -1);
 
     /* constants */
+    rb_define_const(cSocket, "SOCK_STREAM", INT2FIX(SOCK_STREAM));
+    rb_define_const(cSocket, "SOCK_DGRAM", INT2FIX(SOCK_DGRAM));
+    rb_define_const(cSocket, "SOCK_RAW", INT2FIX(SOCK_RAW));
+#ifdef SOCK_RDM
+    rb_define_const(cSocket, "SOCK_RDM", INT2FIX(SOCK_RDM));
+#endif
+#ifdef SOCK_SEQPACKET
+    rb_define_const(cSocket, "SOCK_SEQPACKET", INT2FIX(SOCK_SEQPACKET));
+#endif
+#ifdef SOCK_PACKET
+    rb_define_const(cSocket, "SOCK_PACKET", INT2FIX(SOCK_PACKET));
+#endif
+
     rb_define_const(cSocket, "AF_INET", INT2FIX(AF_INET));
     rb_define_const(cSocket, "PF_INET", INT2FIX(PF_INET));
 #ifdef AF_UNIX
     rb_define_const(cSocket, "AF_UNIX", INT2FIX(AF_UNIX));
     rb_define_const(cSocket, "PF_UNIX", INT2FIX(PF_UNIX));
 #endif
+#ifdef AF_AX25
+    rb_define_const(cSocket, "AF_AX25", INT2FIX(AF_AX25));
+    rb_define_const(cSocket, "PF_AX25", INT2FIX(PF_AX25));
+#endif
 #ifdef AF_IPX
     rb_define_const(cSocket, "AF_IPX", INT2FIX(AF_IPX));
     rb_define_const(cSocket, "PF_IPX", INT2FIX(PF_IPX));
@@ -1078,19 +1307,6 @@ Init_socket ()
     rb_define_const(cSocket, "MSG_PEEK", INT2FIX(MSG_PEEK));
     rb_define_const(cSocket, "MSG_DONTROUTE", INT2FIX(MSG_DONTROUTE));
 
-    rb_define_const(cSocket, "SOCK_STREAM", INT2FIX(SOCK_STREAM));
-    rb_define_const(cSocket, "SOCK_DGRAM", INT2FIX(SOCK_DGRAM));
-    rb_define_const(cSocket, "SOCK_RAW", INT2FIX(SOCK_RAW));
-#ifdef SOCK_RDM
-    rb_define_const(cSocket, "SOCK_RDM", INT2FIX(SOCK_RDM));
-#endif
-#ifdef SOCK_SEQPACKET
-    rb_define_const(cSocket, "SOCK_SEQPACKET", INT2FIX(SOCK_SEQPACKET));
-#endif
-#ifdef SOCK_PACKET
-    rb_define_const(cSocket, "SOCK_PACKET", INT2FIX(SOCK_PACKET));
-#endif
-
     rb_define_const(cSocket, "SOL_SOCKET", INT2FIX(SOL_SOCKET));
 #ifdef SOL_IP
     rb_define_const(cSocket, "SOL_IP", INT2FIX(SOL_IP));
@@ -1098,6 +1314,9 @@ Init_socket ()
 #ifdef SOL_IPX
     rb_define_const(cSocket, "SOL_IPX", INT2FIX(SOL_IPX));
 #endif
+#ifdef SOL_AX25
+    rb_define_const(cSocket, "SOL_AX25", INT2FIX(SOL_AX25));
+#endif
 #ifdef SOL_ATALK
     rb_define_const(cSocket, "SOL_ATALK", INT2FIX(SOL_ATALK));
 #endif
@@ -1108,8 +1327,81 @@ Init_socket ()
     rb_define_const(cSocket, "SOL_UDP", INT2FIX(SOL_UDP));
 #endif
 
+#ifdef SO_DEBUG
     rb_define_const(cSocket, "SO_DEBUG", INT2FIX(SO_DEBUG));
+#endif
     rb_define_const(cSocket, "SO_REUSEADDR", INT2FIX(SO_REUSEADDR));
+#ifdef SO_TYPE
+    rb_define_const(cSocket, "SO_TYPE", INT2FIX(SO_TYPE));
+#endif
+#ifdef SO_ERROR
+    rb_define_const(cSocket, "SO_ERROR", INT2FIX(SO_ERROR));
+#endif
+#ifdef SO_DONTROUTE
+    rb_define_const(cSocket, "SO_DONTROUTE", INT2FIX(SO_DONTROUTE));
+#endif
+#ifdef SO_BROADCAST
+    rb_define_const(cSocket, "SO_BROADCAST", INT2FIX(SO_BROADCAST));
+#endif
+#ifdef SO_SNDBUF
+    rb_define_const(cSocket, "SO_SNDBUF", INT2FIX(SO_SNDBUF));
+#endif
+#ifdef SO_RCVBUF
+    rb_define_const(cSocket, "SO_RCVBUF", INT2FIX(SO_RCVBUF));
+#endif
     rb_define_const(cSocket, "SO_KEEPALIVE", INT2FIX(SO_KEEPALIVE));
+#ifdef SO_OOBINLINE
+    rb_define_const(cSocket, "SO_OOBINLINE", INT2FIX(SO_OOBINLINE));
+#endif
+#ifdef SO_NO_CHECK
+    rb_define_const(cSocket, "SO_NO_CHECK", INT2FIX(SO_NO_CHECK));
+#endif
+#ifdef SO_PRIORITY
+    rb_define_const(cSocket, "SO_PRIORITY", INT2FIX(SO_PRIORITY));
+#endif
     rb_define_const(cSocket, "SO_LINGER", INT2FIX(SO_LINGER));
+
+#ifdef SOPRI_INTERACTIVE
+    rb_define_const(cSocket, "SOPRI_INTERACTIVE", INT2FIX(SOPRI_INTERACTIVE));
+#endif
+#ifdef SOPRI_NORMAL
+    rb_define_const(cSocket, "SOPRI_NORMAL", INT2FIX(SOPRI_NORMAL));
+#endif
+#ifdef SOPRI_BACKGROUND
+    rb_define_const(cSocket, "SOPRI_BACKGROUND", INT2FIX(SOPRI_BACKGROUND));
+#endif
+
+#ifdef IP_MULTICAST_IF
+    rb_define_const(cSocket, "IP_MULTICAST_IF", INT2FIX(IP_MULTICAST_IF));
+#endif
+#ifdef IP_MULTICAST_TTL
+    rb_define_const(cSocket, "IP_MULTICAST_TTL", INT2FIX(IP_MULTICAST_TTL));
+#endif
+#ifdef IP_MULTICAST_LOOP
+    rb_define_const(cSocket, "IP_MULTICAST_LOOP", INT2FIX(IP_MULTICAST_LOOP));
+#endif
+#ifdef IP_ADD_MEMBERSHIP
+    rb_define_const(cSocket, "IP_ADD_MEMBERSHIP", INT2FIX(IP_ADD_MEMBERSHIP));
+#endif
+
+#ifdef IP_DEFAULT_MULTICAST_TTL
+    rb_define_const(cSocket, "IP_DEFAULT_MULTICAST_TTL", INT2FIX(IP_DEFAULT_MULTICAST_TTL));
+#endif
+#ifdef IP_DEFAULT_MULTICAST_LOOP
+    rb_define_const(cSocket, "IP_DEFAULT_MULTICAST_LOOP", INT2FIX(IP_DEFAULT_MULTICAST_LOOP));
+#endif
+#ifdef IP_MAX_MEMBERSHIPS
+    rb_define_const(cSocket, "IP_MAX_MEMBERSHIPS", INT2FIX(IP_MAX_MEMBERSHIPS));
+#endif
+
+#ifdef IPX_TYPE
+    rb_define_const(cSocket, "IPX_TYPE", INT2FIX(IPX_TYPE));
+#endif
+
+#ifdef TCP_NODELAY
+    rb_define_const(cSocket, "TCP_NODELAY", INT2FIX(TCP_NODELAY));
+#endif
+#ifdef TCP_MAXSEG
+    rb_define_const(cSocket, "TCP_MAXSEG", INT2FIX(TCP_MAXSEG));
+#endif
 }