From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 9 Jun 2015 01:59:58 +0000 (-0700)
Subject: Merge from trunk rev.14108
X-Git-Tag: merge-candidate-3-v1~81^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bcc2790b5bff6f5c047c65be39e37f8edd8e20f;p=thirdparty%2Fsquid.git

Merge from trunk rev.14108
---

6bcc2790b5bff6f5c047c65be39e37f8edd8e20f
diff --cc src/http/one/Makefile.am
index a5bfa65bce,33edb01dc6..2a2734227e
--- a/src/http/one/Makefile.am
+++ b/src/http/one/Makefile.am
@@@ -18,5 -18,5 +18,7 @@@ libhttp1_la_SOURCES = 
  	RequestParser.h \
  	ResponseParser.cc \
  	ResponseParser.h \
+ 	TeChunkedParser.cc \
 -	TeChunkedParser.h
++	TeChunkedParser.h \
 +	Tokenizer.cc \
 +	Tokenizer.h