---------------------
PatchSet 8575 
Date: 2006/08/31 06:03:33
Author: adri
Branch: parserwork
Tag: (none) 
Log:
Optimise out a strdup/free.

Members: 
	include/util.h:1.13->1.13.32.1 
	lib/rfc1123.c:1.9->1.9.18.1 
	src/HttpHeader.c:1.23.4.1->1.23.4.2 

Index: squid/include/util.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/include/util.h,v
retrieving revision 1.13
retrieving revision 1.13.32.1
diff -u -r1.13 -r1.13.32.1
--- squid/include/util.h	12 May 2006 22:51:56 -0000	1.13
+++ squid/include/util.h	31 Aug 2006 06:03:33 -0000	1.13.32.1
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.13 2006/05/12 22:51:56 squidadm Exp $
+ * $Id: util.h,v 1.13.32.1 2006/08/31 06:03:33 adri Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -52,6 +52,10 @@
 #define _etext etext
 #endif
 
+#ifndef MIN
+#define MIN(a,b) (a<b?a:b)
+#endif
+
 extern const char *getfullhostname(void);
 extern const char *mkhttpdlogtime(const time_t *);
 extern const char *mkrfc1123(time_t);
@@ -65,7 +69,7 @@
 extern double tvSubDsec(struct timeval, struct timeval);
 extern char *xstrncpy(char *, const char *, size_t);
 extern size_t xcountws(const char *str);
-extern time_t parse_rfc1123(const char *str);
+extern time_t parse_rfc1123(const char *str, int len);
 extern void *xcalloc(size_t, size_t);
 extern void *xmalloc(size_t);
 extern void *xrealloc(void *, size_t);
Index: squid/lib/rfc1123.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/rfc1123.c,v
retrieving revision 1.9
retrieving revision 1.9.18.1
diff -u -r1.9 -r1.9.18.1
--- squid/lib/rfc1123.c	22 May 2006 19:52:18 -0000	1.9
+++ squid/lib/rfc1123.c	31 Aug 2006 06:03:34 -0000	1.9.18.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: rfc1123.c,v 1.9 2006/05/22 19:52:18 squidadm Exp $
+ * $Id: rfc1123.c,v 1.9.18.1 2006/08/31 06:03:34 adri Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -157,11 +157,14 @@
     return tmSaneValues(&tm) ? &tm : NULL;
 }
 
+/* Whats the maximum length we should try to parse? call it, say, 128 bytes! */
+#define TIMEBUFLEN 128
+
 static struct tm *
-parse_date(const char *str)
+parse_date(const char *str, int len)
 {
     struct tm *tm;
-    char *tmp = xstrdup(str);
+    char tmp[TIMEBUFLEN];
     char *t;
     char *wday = NULL;
     char *day = NULL;
@@ -170,6 +173,14 @@
     char *time = NULL;
     char *zone = NULL;
 
+    /*
+     * This doesn't check for leading whitespace. If this becomes a problem
+     * (ie some caches/clients are padding with too much whitespace!) then
+     * just search for the first non-whitespace and then copy from -that-
+     * point.
+     */
+    memcpy(tmp, str, MIN(len, TIMEBUFLEN));
+
     for (t = strtok(tmp, ", "); t; t = strtok(NULL, ", ")) {
 	if (xisdigit(*t)) {
 	    if (!day) {
@@ -197,18 +208,17 @@
     }
     tm = parse_date_elements(day, month, year, time, zone);
 
-    xfree(tmp);
     return tm;
 }
 
 time_t
-parse_rfc1123(const char *str)
+parse_rfc1123(const char *str, int len)
 {
     struct tm *tm;
     time_t t;
     if (NULL == str)
 	return -1;
-    tm = parse_date(str);
+    tm = parse_date(str, len);
     if (!tm)
 	return -1;
     tm->tm_isdst = -1;
Index: squid/src/HttpHeader.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/HttpHeader.c,v
retrieving revision 1.23.4.1
retrieving revision 1.23.4.2
diff -u -r1.23.4.1 -r1.23.4.2
--- squid/src/HttpHeader.c	23 Aug 2006 14:36:54 -0000	1.23.4.1
+++ squid/src/HttpHeader.c	31 Aug 2006 06:03:34 -0000	1.23.4.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: HttpHeader.c,v 1.23.4.1 2006/08/23 14:36:54 adri Exp $
+ * $Id: HttpHeader.c,v 1.23.4.2 2006/08/31 06:03:34 adri Exp $
  *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
@@ -1030,7 +1030,7 @@
     assert_eid(id);
     assert(Headers[id].type == ftDate_1123);	/* must be of an appropriate type */
     if ((e = httpHeaderFindEntry(hdr, id))) {
-	value = parse_rfc1123(strBuf(e->value));
+	value = parse_rfc1123(strBuf(e->value), strLen(e->value));
 	httpHeaderNoteParsedEntry(e->id, e->value, value < 0);
     }
     return value;
@@ -1148,7 +1148,7 @@
 	    tot.valid = 1;
 	} else {
 	    /* or maybe it is time? */
-	    tot.time = parse_rfc1123(str);
+	    tot.time = parse_rfc1123(str, strLen(e->value));
 	    if (tot.time >= 0)
 		tot.valid = 1;
 	    tot.tag = NULL;