diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-10-10 19:48:37 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-10-10 19:48:37 +0000 |
| commit | 37a7e3382c8daea28ea5e38372696d2da7ce5fd7 (patch) | |
| tree | 8fd2ae571e198b61b5785751fbf68b2ed0703971 /Makefile.nmake | |
| parent | d8231f1222a9861b3512cac592a42dce0509d40f (diff) | |
| download | wireshark-37a7e3382c8daea28ea5e38372696d2da7ce5fd7.tar.gz wireshark-37a7e3382c8daea28ea5e38372696d2da7ce5fd7.tar.bz2 wireshark-37a7e3382c8daea28ea5e38372696d2da7ce5fd7.zip | |
Revert the changes made to resolve https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res).
#BACKPORT(1.10)
svn path=/trunk/; revision=52506
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 489a2291df..7bdcfe6f4e 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -81,7 +81,6 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ $(PYTHON_LIBS) \ - $(ZLIB_LIBS) \ $(WINSPARKLE_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ @@ -92,7 +91,8 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) + $(ADNS_LIBS) \ + $(ZLIB_LIBS) !ENDIF tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ |