]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Merge from trunk rev.14108
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 9 Jun 2015 01:59:58 +0000 (18:59 -0700)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 9 Jun 2015 01:59:58 +0000 (18:59 -0700)
1  2 
src/http/one/Makefile.am
src/http/one/Parser.h
src/http/one/forward.h

index a5bfa65bceb567d02c13ed1f3d07d3e1e8d26a4a,33edb01dc64133c28ce7c54dda4828d36f25c37d..2a2734227e29a4524effc9498b268c155d637fda
@@@ -18,5 -18,5 +18,7 @@@ libhttp1_la_SOURCES = 
        RequestParser.h \
        ResponseParser.cc \
        ResponseParser.h \
 -      TeChunkedParser.h
+       TeChunkedParser.cc \
++      TeChunkedParser.h \
 +      Tokenizer.cc \
 +      Tokenizer.h
Simple merge
Simple merge