diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-01-09 05:27:43 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-01-09 05:27:43 +0000 |
| commit | c3ad628d96130eceb849c673d74b14a2a4026630 (patch) | |
| tree | e69ddfa83cbfcfb2330c6aecf81489965a333941 | |
| parent | b929591edcae27748b956632f69dc12ede053bd7 (diff) | |
| download | ruby-c3ad628d96130eceb849c673d74b14a2a4026630.tar.gz ruby-c3ad628d96130eceb849c673d74b14a2a4026630.tar.xz ruby-c3ad628d96130eceb849c673d74b14a2a4026630.zip | |
* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
(VisualC++6) so use -O2b2xg- if $(MSC_VER) < 1400. [ruby-core:7040]
* lib/webrick/httpservlet/filehandler.rb: fixed typo. (Kero van Gelder)
[ruby-core:7075]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/filehandler.rb | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Mon Jan 9 14:17:12 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag, + (VisualC++6) so use -O2b2xg- if $(MSC_VER) < 1400. [ruby-core:7040] + + * lib/webrick/httpservlet/filehandler.rb: fixed typo. (Kero van Gelder) + [ruby-core:7075] + Sat Jan 7 15:40:07 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (singleton): get rid of segfault on syntax error. diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb index ba9417f3e..410cc6f9a 100644 --- a/lib/webrick/httpservlet/filehandler.rb +++ b/lib/webrick/httpservlet/filehandler.rb @@ -51,7 +51,7 @@ module WEBrick return true end rescue - if HTTPUtils::split_header_valie(ir).member?(res['etag']) + if HTTPUtils::split_header_value(ir).member?(res['etag']) return true end end diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 1e881f1b3..a04f614c2 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -69,8 +69,12 @@ ARCH = $(PROCESSOR_ARCHITECTURE) DEBUGFLAGS = -Zi !endif !if !defined(OPTFLAGS) +!if $(MSC_VER) < 1400 +OPTFLAGS = -O2b2xg- +!else OPTFLAGS = -O2b2xty- !endif +!endif !if !defined(OS) OS = mswin32 !endif |