From 343951402bcd6de4d6832d9e02314b0aaa88679d Mon Sep 17 00:00:00 2001 From: znek Date: Fri, 22 Jul 2005 12:48:53 +0000 Subject: [PATCH] Fixed 304 handling git-svn-id: http://svn.opengroupware.org/SOPE/trunk@932 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/WEExtensions/ChangeLog | 5 +++++ sope-appserver/WEExtensions/JSStringTable.m | 4 ++-- sope-appserver/WEExtensions/Version | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog index b7bed0e1..b8fa5897 100644 --- a/sope-appserver/WEExtensions/ChangeLog +++ b/sope-appserver/WEExtensions/ChangeLog @@ -1,3 +1,8 @@ +2005-07-22 Marcus Mueller + + * JSStringTable.m: if 'if-none-match' is not set, do not return a 304 + (v4.5.78) + 2005-07-20 Marcus Mueller * WEExtensions.xcodeproj: added JSStringTable, bumped framework version diff --git a/sope-appserver/WEExtensions/JSStringTable.m b/sope-appserver/WEExtensions/JSStringTable.m index fac50ae3..ef8bfa62 100644 --- a/sope-appserver/WEExtensions/JSStringTable.m +++ b/sope-appserver/WEExtensions/JSStringTable.m @@ -221,7 +221,7 @@ static NSString *etag = nil; for all instances. */ char buf[32]; - sprintf(buf, "stamp_%d", ((unsigned)time(NULL) - 1121785679)); + sprintf(buf, "\"stamp_%d\"", ((unsigned)time(NULL) - 1121785679)); etag = [[NSString alloc] initWithCString:buf]; } @@ -258,7 +258,7 @@ static NSString *etag = nil; /* check preconditions */ s = [[[self context] request] headerForKey:@"if-none-match"]; - if ([s rangeOfString:etag].length > 0) { + if (s && [s rangeOfString:etag].length > 0) { /* client already has the proper entity */ [r setStatus:304 /* Not Modified */]; return r; diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version index 765ffcd9..847ef478 100644 --- a/sope-appserver/WEExtensions/Version +++ b/sope-appserver/WEExtensions/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=77 +SUBMINOR_VERSION:=78 # v4.5.76 requires libNGObjWeb v4.5.176 # v4.5.75 requires libNGObjWeb v4.5.174 -- 2.39.5