diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-07 12:10:03 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-03-07 12:10:03 +0000 |
commit | 24cb3707eb4abc3060e234cb0927edde3ff0b0ad (patch) | |
tree | 4faf09890511fce6f2f2d54b7af5a7f9ca18515f /ext/openssl/extconf.rb | |
parent | 64eaecb8a8e79c63f4dfa88f8b6bed1d7d9fcd51 (diff) |
* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
ossl_ssl_write):
- need to set errno on Win32 platform.
- should call rb_sys_fail instead of rasing SSLError if
SSL_ERROR_SYSCALL occured.
- should wait for that the underlying IO become readable or
writable if the error was SSL_ERROR_WANT_READ or
SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
* ext/openssl/lib/openssl/buffering.rb
(Buffering#initialize): should set @eof and @rbuffer.
(Buffering#fill_rbuff): should rescue Errno::EAGAIN.
(Buffering#consume_rbuf): pointless eof flag resetting is deleted.
(Buffering#read): should return an empty string if the specified
size is zero.
(Buffering#readpartial): new method.
(Buffering#readline): fix typo.
(Buffering#getc): return the first character of string correctly.
(Buffering#each): fix typo. suggested by Brian Ollenberger.
(Buffering#readchar): fix typo.
(Buffering#eof?): should read again it the input buffer is empty.
(Buffering#do_write): should rescue Errno::EAGAIN.
(Buffering#puts): use "\n" as the output field separator.
* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
underlying IO.
* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
* text/openssl/test_pair.rb: test for IO like methods.
* test/ruby/ut_eof.rb: test about empty file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/extconf.rb')
-rw-r--r-- | ext/openssl/extconf.rb | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index d587116c82..4517ec82fb 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -113,33 +113,5 @@ have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h") have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h") message "=== Checking done. ===\n" -$distcleanfiles << "GNUmakefile" << "dep" create_makefile("openssl") -if /gcc/ =~ CONFIG["CC"] - File.open("GNUmakefile", "w") {|f| - f.print <<EOD -include Makefile - -SRCS = $(OBJS:.o=.c) - -test-link: $(OBJS) - $(CC) $(DLDFLAGS) #{OUTFLAG}.testlink $(OBJS) $(LIBPATH) $(LIBS) $(LOCAL_LIBS) - @$(RM) .testlink - @echo "Done." - -dep: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $(SRCS) -MM | \\ - $(RUBY) -p -e 'BEGIN{S = []' \\ - -e 'while !ARGV.empty? and /^(\\w+)=(.*)/ =~ ARGV[0]' \\ - -e 'S << [/\#{Regexp.quote($$2)}\\//, "$$(\#{$$1})/"]' \\ - -e 'ARGV.shift' \\ - -e 'end' \\ - -e '}' -e 'S.each(&method(:gsub!))' -- \\ - 'topdir=$(topdir)' 'srcdir=$(srcdir)' 'hdrdir=$(hdrdir)' \\ - > dep - -include dep -EOD - } -end message "Done.\n" |