further corrections.

11 files changed, 14 insertions, 54 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c816467b6..5891c81d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -217,8 +217,6 @@ endif()
 if(ENABLE_MANUAL)
   set(USE_MANUAL ON)
 endif()
-# Required for building manual, docs, tests
-find_package(Perl REQUIRED)
 
 # We need ansi c-flags, especially on HP
 set(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
diff --git a/configure.ac b/configure.ac
index 0bd697327..6c67bbfbd 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1322,7 +1322,14 @@ if test x"$want_gss" = xyes; then
      esac
   else
      LDFLAGS="$LDFLAGS $GSSAPI_LIB_DIR"
-     LIBS="-lgssapi $LIBS"
+     case $host in
+     *-hp-hpux*)
+        LIBS="lgss $LIBS"
+        ;;
+     *)
+        LIBS="-lgssapi $LIBS"
+        ;;
+     esac
   fi
 else
   CPPFLAGS="$save_CPPFLAGS"
diff --git a/docs/TODO b/docs/TODO
index 18896b070..264d559ad 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -537,6 +537,7 @@ This is not detailed in any FTP specification.
 
  https://tools.ietf.org/html/draft-ietf-httpbis-cookie-alone-01
 
+
 6. TELNET
 
 6.1 ditch stdin
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d99e49cf9..ed99956fd 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -92,10 +92,6 @@ libgnurl_la_CFLAGS_EXTRA =
 libgnurl_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
 libgnurl_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
 
-@CODE_COVERAGE_RULES@
-libcurl_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
-libcurl_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
-
 if CURL_LT_SHLIB_USE_VERSION_INFO
 libgnurl_la_LDFLAGS_EXTRA += $(VERSIONINFO)
 endif
@@ -121,9 +117,9 @@ libgnurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS
 libgnurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING)
 endif
 
-libgnurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA)
-libgnurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
-libgnurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA)
+libgnurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libgnurl_la_CPPFLAGS_EXTRA)
+libgnurl_la_LDFLAGS = $(AM_LDFLAGS) $(libgnurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS)
+libgnurl_la_CFLAGS = $(AM_CFLAGS) $(libgnurl_la_CFLAGS_EXTRA)
 
 libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
 libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
diff --git a/lib/getinfo.c b/lib/getinfo.c
index b235f54ca..2385717d1 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -280,39 +280,6 @@ static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
   return CURLE_OK;
 }
 
-#define DOUBLE_SECS(x) (double)(x)/1000000
-
-static CURLcode getinfo_offt(struct Curl_easy *data, CURLINFO info,
-                             curl_off_t *param_offt)
-{
-  switch(info) {
-  case CURLINFO_SIZE_UPLOAD_T:
-    *param_offt = data->progress.uploaded;
-    break;
-  case CURLINFO_SIZE_DOWNLOAD_T:
-    *param_offt = data->progress.downloaded;
-    break;
-  case CURLINFO_SPEED_DOWNLOAD_T:
-    *param_offt =  data->progress.dlspeed;
-    break;
-  case CURLINFO_SPEED_UPLOAD_T:
-    *param_offt = data->progress.ulspeed;
-    break;
-  case CURLINFO_CONTENT_LENGTH_DOWNLOAD_T:
-    *param_offt = (data->progress.flags & PGRS_DL_SIZE_KNOWN)?
-      data->progress.size_dl:-1;
-    break;
-  case CURLINFO_CONTENT_LENGTH_UPLOAD_T:
-    *param_offt = (data->progress.flags & PGRS_UL_SIZE_KNOWN)?
-      data->progress.size_ul:-1;
-    break;
-  default:
-    return CURLE_UNKNOWN_OPTION;
-  }
-
-  return CURLE_OK;
-}
-
 static CURLcode getinfo_double(struct Curl_easy *data, CURLINFO info,
                                double *param_doublep)
 {
diff --git a/lib/http.c b/lib/http.c
index b5164f758..962909055 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1637,10 +1637,6 @@ CURLcode Curl_add_custom_headers(struct connectdata *conn,
                   checkprefix("Transfer-Encoding:", headers->data))
             /* HTTP/2 doesn't support chunked requests */
             ;
-          else if((conn->httpversion == 20) &&
-                  checkprefix("Transfer-Encoding:", headers->data))
-            /* HTTP/2 doesn't support chunked requests */
-            ;
           else {
             CURLcode result = Curl_add_bufferf(req_buffer, "%s\r\n",
                                                headers->data);
diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
index 1be646e8e..bb8fda419 100644
--- a/lib/vtls/vtls.c
+++ b/lib/vtls/vtls.c
@@ -120,8 +120,6 @@ Curl_clone_primary_ssl_config(struct ssl_primary_config *source,
   CLONE_STRING(egdsocket);
   CLONE_STRING(cipher_list);
 
-  /* Disable dest sessionid cache if a client cert is used, CVE-2016-5419. */
-  dest->sessionid = (dest->clientcert ? false : source->sessionid);
   return TRUE;
 }
 
diff --git a/lib/wildcard.h b/lib/wildcard.h
index 198b70b86..89d965ccf 100644
--- a/lib/wildcard.h
+++ b/lib/wildcard.h
@@ -26,8 +26,6 @@
 
 #include "llist.h"
 
-#include "llist.h"
-
 /* list of wildcard process states */
 typedef enum {
   CURLWC_CLEAR = 0,
diff --git a/libgnurl.pc.in b/libgnurl.pc.in
index ec56fffcf..e59e2ab94 100644
--- a/libgnurl.pc.in
+++ b/libgnurl.pc.in
@@ -31,7 +31,7 @@ supported_protocols="@SUPPORT_PROTOCOLS@"
 supported_features="@SUPPORT_FEATURES@"
 
 Name: libgnurl
-URL: http://curl.haxx.se/
+URL: https://gnunet.org/gnurl/
 Description: Library to transfer files with http or https
 Version: @GNURLVERSION@
 Libs: -L${libdir} -lgnurl
diff --git a/maketgz b/maketgz
index 35df2b731..7d266a2b5 100755
--- a/maketgz
+++ b/maketgz
@@ -221,7 +221,6 @@ tempdir=".builddir"
 echo "------------------"
 echo "maketgz report:"
 echo ""
-#ls -l $targz $bzip2 $zip $xz
 ls -l $targz $bzip2 $xz
 
 echo "Run this:"
diff --git a/scripts/log2changes.pl b/scripts/log2changes.pl
index 4e35e9cad..2cc39bc6d 100755
--- a/scripts/log2changes.pl
+++ b/scripts/log2changes.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 # git log --pretty=fuller --no-color --date=short --decorate=full