* GSWeb/GSWResponse.m

* GSWeb/GSWHTTPIO.m
do not add ETag
* GSWeb/GSWResourceRequestHandler.h
add request: argument to _responseForDataAtPath:
* GSWeb/GSWResourceRequestHandler.m
add request: argument to _responseForDataAtPath:
_responseForDataAtPath:request:
generate Last-Modified header
generate ETag header
use hash of modification date and size
(faster than over a large NSData object)
check for if-none-match header



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30832 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,18 @@
+2010-06-22  David Wetzel <dave@turbocat.de>
+	* GSWeb/GSWResponse.m
+	* GSWeb/GSWHTTPIO.m
+	do not add ETag
+	* GSWeb/GSWResourceRequestHandler.h
+	add request: argument to _responseForDataAtPath:
+	* GSWeb/GSWResourceRequestHandler.m
+	add request: argument to _responseForDataAtPath:
+	_responseForDataAtPath:request:
+	generate Last-Modified header
+	generate ETag header
+	use hash of modification date and size
+	(faster than over a large NSData object)
+	check for if-none-match header
+	
 2010-06-22  David Wetzel <dave@turbocat.de>
 	* GSWeb/GSWResourceManager.m
 	make url prefix dynamic based on [request _applicationURLPrefix]

GSWeb/GSWHTTPIO.m

@@ -214,12 +214,9 @@ void _sendMessage(GSWResponse * message, NSFileHandle* fh, NSString * httpVersio
   int  contentLength = 0;
   BOOL keepAlive = NO;
   BOOL requestIsHead = NO;
-  NSString * eTagString = nil;
-  NSString * ifNoneMatchValue;
 
   if (message) {
     contentLength = [message _contentLength];
-    eTagString = [message headerForKey:@"ETag"];
   }
   
   if (request) {
@@ -228,12 +225,6 @@ void _sendMessage(GSWResponse * message, NSFileHandle* fh, NSString * httpVersio
       keepAlive = [connectionValue isEqualToString:KEEP_ALIVE];
     }
     requestIsHead = [[request method] isEqualToString:HEAD];
-    ifNoneMatchValue = [request headerForKey:@"if-none-match"];
-  }
-
-  if ([ifNoneMatchValue isEqualToString:eTagString]) {
-    // return 304 Not Modified
-    [message setStatus:304];
   }
   
   [headers appendString:GSWIntToNSString([message status])];

GSWeb/GSWResourceRequestHandler.h

@@ -39,8 +39,12 @@
 
 -(GSWResponse*)handleRequest:(GSWRequest*)aRequest;
 -(GSWResponse*)_responseForJavaClassAtPath:(NSString*)aPath;
--(GSWResponse*)_responseForDataAtPath:(NSString*)aPath;
+
+-(GSWResponse*)_responseForDataAtPath:(NSString*)aPath 
+                              request:(GSWRequest*)aRequest;
+
 -(GSWResponse*)_responseForDataCachedWithKey:(NSString*)aKey;
+
 -(GSWResponse*)_generateResponseForData:(NSData*)aData
                                mimeType:(NSString*)mimeType;
 

GSWeb/GSWResourceRequestHandler.m

@@ -130,7 +130,7 @@ RCS_ID("$Id$")
   } else {    
     filePath = [self _filepathForUripath:urlRequestHandlerPath];
     
-    response = [self _responseForDataAtPath:filePath];
+    response = [self _responseForDataAtPath:filePath request:aRequest];
   }
   
   [[NSNotificationCenter defaultCenter] postNotificationName:DidHandleRequestNotification
@@ -150,26 +150,56 @@ RCS_ID("$Id$")
 
 //--------------------------------------------------------------------
 -(GSWResponse*)_responseForDataAtPath:(NSString*)aPath 
+                              request:(GSWRequest*)aRequest
 {
-  NSUInteger      fileLength = 0;
   NSString      * contentType;
   NSData        * fileData;
   GSWResponse   * aResponse;
+  NSDictionary  * attributes;
+  NSDate        * modDate;
+  NSString      * eTagString;
+  NSString      * dateString;
+  NSString      * hashString;
+  NSString      * ifNoneMatchValue;
   
+  attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:aPath 
+                                                                error:NULL];
+  modDate = [attributes fileModificationDate];
 
-  fileData = [NSData dataWithContentsOfFile:aPath];
+  if (!modDate) {
-  
-  if (!fileData) {
     return [self _404ResponseForPath:aPath];
   }
   
-  contentType = [[GSWApp resourceManager] contentTypeForResourcePath:aPath];
+  dateString = [modDate descriptionWithCalendarFormat:@"%a, %d %b %Y %H:%M:%S GMT"
+                                             timeZone:[NSTimeZone timeZoneWithAbbreviation:@"GMT"]
+                                               locale:nil];
 
   aResponse = [GSWApp createResponseInContext:nil];
   
+  [aResponse setHeader:dateString
+                forKey:@"Last-Modified"];
+
+  hashString = [NSString stringWithFormat:@"%@-%@", dateString, [attributes objectForKey:NSFileSize]];
+  
+  eTagString = [NSString stringWithFormat:@"%lx", (unsigned long) [hashString hash]];
+  
+  [aResponse setHeader:eTagString
+                forKey:@"ETag"];
+  
+  ifNoneMatchValue = [aRequest headerForKey:@"if-none-match"];
+
+  if ([ifNoneMatchValue isEqualToString:eTagString]) {
+    // return 304 Not Modified
+    [aResponse setStatus:304];  
+    
+  } else {
+    
+    fileData = [NSData dataWithContentsOfFile:aPath];
+    [aResponse setContent:fileData];
     [aResponse setStatus:200];
-  [aResponse setHeader:[NSString stringWithFormat:@"%d",[fileData length]]
+  }
-                forKey:@"content-length"];
+  
+  contentType = [[GSWApp resourceManager] contentTypeForResourcePath:aPath];
   
   if (contentType)
   {
@@ -177,7 +207,6 @@ RCS_ID("$Id$")
                   forKey:@"content-type"];
   }
   
-  [aResponse setContent:fileData];
   
   return aResponse;
 }

GSWeb/GSWResponse.m

@@ -280,11 +280,13 @@ void GSWResponse_appendTagAttributeValueEscapingHTMLAttributeValue(GSWResponse*
   dataLength=[self _contentLength];
   
   if (dataLength>0) {
+/*
  NSString * eTagString = [NSString stringWithFormat:@"%lx", 
                              (unsigned long) [_contentData hash]];
     
     [self setHeader:eTagString
              forKey:@"ETag"];
+ */
   }
   
   // Now we see if we can gzip the content