---------------------
PatchSet 4775 
Date: 2002/08/25 10:07:20
Author: rbcollins
Branch: esi
Tag: (none) 
Log:
Cleanup of TODO's

Members: 
	src/ESI.c:1.1.2.25->1.1.2.26 

Index: squid/src/ESI.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Attic/ESI.c,v
retrieving revision 1.1.2.25
retrieving revision 1.1.2.26
diff -u -r1.1.2.25 -r1.1.2.26
--- squid/src/ESI.c	25 Aug 2002 09:58:25 -0000	1.1.2.25
+++ squid/src/ESI.c	25 Aug 2002 10:07:20 -0000	1.1.2.26
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ESI.c,v 1.1.2.25 2002/08/25 09:58:25 rbcollins Exp $
+ * $Id: ESI.c,v 1.1.2.26 2002/08/25 10:07:20 rbcollins Exp $
  *
  * DEBUG: section 86    ESI processing
  * AUTHOR: Robert Collins
@@ -83,7 +83,6 @@
  */
 
 /* TODO: remove invalid markup (silently swallow markup in invalid locations
- * TODO: Set Vary: when using Variables.
  *
  *
  * NOT TODO: esi:inline - out of scope.
@@ -659,7 +658,10 @@
 /* Process incoming data for ESI tags */
 /* ESI TODO: Long term: we should have a framework to parse html/xml and
  * callback to a set of processors like this, to prevent multiple parsing
- * overhead 
+ * overhead. More thoughts on this: We have to parse multiple times, because
+ * the output of one processor may create a very different tree. What we could
+ * do is something like DOM and pass that down to a final renderer. This is 
+ * getting into web server territory though...
  * 
  * Preconditions:
  *   This is not the last node in the stream.
@@ -1041,7 +1043,6 @@
     if (!strncmp(s, "esi",3)) {
 	XML_Parser p;
 	debug (86,5)("esiExpatComment: ESI <!-- block encountered\n");
-	/* TODO: pass this to ?? another ?? expat parser? Guess so. */
 	p = XML_ParserCreate(NULL);
 	XML_SetUserData (p, context);
 	XML_SetElementHandler(p, start, end);
@@ -1152,7 +1153,6 @@
 		    return ESI_PROCESS_FAILED;
 		}
 		if (context->flags.error) {
-		    /* TODO" check if we should reset flags.failed */
 		    context->errorpage = ERR_ESI;
 		    context->errorstatus = HTTP_INTERNAL_SERVER_ERROR;
 		    return ESI_PROCESS_FAILED;
@@ -1373,8 +1373,12 @@
     esiStreamContext *esiStream;
     /* Test preconditions */
     assert (node != NULL);
-    /* ESI TODO: handle this rather than asserting - it should only ever happen if we cause an abort and the callback chain 
-     * loops back to here, so we can simply return. However, that itself shouldn't happen, so it stays as an assert for now. */
+    /* ESI TODO: handle this rather than asserting 
+     * - it should only ever happen if we cause an 
+     * abort and the callback chain loops back to 
+     * here, so we can simply return. However, that 
+     * itself shouldn't happen, so it stays as an 
+     * assert for now. */
     assert (cbdataReferenceValid (node));
     assert (node->data != NULL); 
     assert (node->node.next == NULL);
@@ -1387,8 +1391,6 @@
     
     debug (86,5) ("esiBufferRecipient rep %p body %p len %d\n", rep, body_data, body_size);
 
-    /* handle data - ESI TODO */
-    /* basic outline follows */
     /* trivial case */
     if (http->out.offset != 0) {
         assert(rep == NULL);
@@ -1626,7 +1628,6 @@
 	/* free the pre-processed content */
 	esiSegmentFreeList (&this->buffer);
 	this->buffer = esiVarStateExtractList (this->varState);
-	/* TODO: process variables */
     }
     this->flags.donevars = 1;
     return ESI_PROCESS_COMPLETE;
@@ -2361,7 +2362,7 @@
 	    if (!subref)
 		s = httpHeaderGetStr (&this->hdr, HDR_USER_AGENT);
 	    else {
-		s = "TODO";
+		s = "TODO - how is the user agent string parsed?";
 	    }
 	} else s = found_default;
 	esiSegmentListAppend (&this->output, s, strlen (s));
@@ -2464,7 +2465,6 @@
     char *found_default = NULL;
     esiVar_t vartype = ESI_VAR_OTHER;
     esiSegmentFreeList (&this->output);
-    /* TODO: use strcspn? */
     while (pos < len) {
 	    switch (state) {
 	      case 0: /* skipping pre-variables */