From c16cbe386ab8d7d15a23ce44ca34b8a78b0c3a97 Mon Sep 17 00:00:00 2001 From: ocean Date: Mon, 9 Jan 2006 05:27:43 +0000 Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/webrick/httpservlet/filehandler.rb | 2 +- win32/Makefile.sub | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index af0b80141f..1776baba8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 9 14:17:12 2006 Hirokazu Yamamoto + + * 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 * 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 ba9417f3e8..410cc6f9a9 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 1e881f1b33..a04f614c2d 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 -- cgit v1.2.3