Stage for upstream/v2.9a

CHANGELOG

@@ -1,3 +1,15 @@
+------------------------------------------------------------------------
+r83 | roseg | 2018-05-11 12:16:05 +0200 (Fri, 11 May 2018) | 9 lines
+
+Release 2.8
+
+Enhancements:
+    - removed DynScale flag and support
+    - removed support for multi-line headers (both input and output)
+
+Bug fixes:
+    - fixed potential request smuggling via fudged headers
+
 ------------------------------------------------------------------------
 r82 | roseg | 2016-10-23 16:59:47 +0200 (Sun, 23 Oct 2016) | 8 lines
 

Makefile.in

@@ -27,7 +27,7 @@ CC=@PTHREAD_CC@
 
 CFLAGS=-DF_CONF=\"@sysconfdir@/pound.cfg\" -DVERSION=\"@PACKAGE_VERSION@\" -DC_SSL=\"@C_SSL@\" -DC_T_RSA=\"@C_T_RSA@\" \
 	-DC_DH_LEN=\"@C_DH_LEN@\" -DC_MAXBUF=\"@C_MAXBUF@\" -DC_OWNER=\"@C_OWNER@\" -DC_GROUP=\"@C_GROUP@\" \
-    -DC_SUPER=\"@C_SUPER@\" -DC_CERT1L=\"@C_CERT1L@\" @CFLAGS@ @PTHREAD_CFLAGS@ @CPPFLAGS@
+    -DC_SUPER=\"@C_SUPER@\" @CFLAGS@ @PTHREAD_CFLAGS@ @CPPFLAGS@
 LIBS=@LIBS@ @PTHREAD_LIBS@
 
 prefix=@prefix@
@@ -37,7 +37,7 @@ exec_prefix=@exec_prefix@
 
 OBJS=pound.o http.o config.o svc.o
 
-all:	pound poundctl pound.8
+all:	pound poundctl pound.8 dh2048.pem
 
 pound:	$(OBJS)
 		${CC} @LDFLAGS@ -o pound $(OBJS) $(LIBS)
@@ -54,6 +54,9 @@ dh@[email protected]:
 svc.o:		svc.c dh512.h dh@[email protected]
 		${CC} ${CFLAGS} -c -o svc.o svc.c
 
+dh2048.pem:
+		openssl dhparam -5 -out dh2048.pem 2048
+
 $(OBJS) poundctl.o:	pound.h config.h
 
 install:	all

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pound 2.8a.
+# Generated by GNU Autoconf 2.69 for pound 2.8+github.
 #
 # Report bugs to <[email protected]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pound'
 PACKAGE_TARNAME='pound'
-PACKAGE_VERSION='2.8a'
-PACKAGE_STRING='pound 2.8a'
+PACKAGE_VERSION='2.8+github'
+PACKAGE_STRING='pound 2.8+github'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -630,7 +630,6 @@ LIBOBJS
 EGREP
 GREP
 CPP
-C_CERT1L
 C_SUPER
 C_GROUP
 C_OWNER
@@ -713,7 +712,6 @@ with_maxbuf
 with_owner
 with_group
 enable_super
-enable_cert1l
 enable_pcreposix
 enable_tcmalloc
 enable_hoard
@@ -1277,7 +1275,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pound 2.8a to adapt to many kinds of systems.
+\`configure' configures pound 2.8+github to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1342,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pound 2.8a:";;
+     short | recursive ) echo "Configuration of pound 2.8+github:";;
    esac
   cat <<\_ACEOF
 
@@ -1354,8 +1352,6 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-super          enable or disable running with supervisor process
                           (default: enabled)
-  --enable-cert1l         enable or disable single-line certificate (default:
-                          disabled)
   --enable-pcreposix      enable or disable using the pcreposix library
                           (default: enabled if available)
   --enable-tcmalloc       enable or disable using the tcmalloc library
@@ -1451,7 +1447,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pound configure 2.8a
+pound configure 2.8+github
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1874,7 +1870,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pound $as_me 2.8a, which was
+It was created by pound $as_me 2.8+github, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3829,13 +3825,6 @@ fi
 
 
 
-# Check whether --enable-cert1l was given.
-if test "${enable_cert1l+set}" = set; then :
-  enableval=$enable_cert1l; test ${enableval} = "yes" && CFLAGS="${CFLAGS} -DCERT1L"; C_CERT1L="1"
-fi
-
-
-
 # Check whether --enable-pcreposix was given.
 if test "${enable_pcreposix+set}" = set; then :
   enableval=$enable_pcreposix; C_PCREPOSIX=${enableval}
@@ -3862,51 +3851,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: *** Checking for libraries ***" >&5
 $as_echo "$as_me: *** Checking for libraries ***" >&6;}
-LIBS="${LIBS} -lm"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
 
-fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
 $as_echo_n "checking for socket in -lsocket... " >&6; }
@@ -3948,46 +3893,6 @@ if test "x$ac_cv_lib_socket_socket" = xyes; then :
   LIBS="-lsocket -lnsl ${LIBS}"
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hstrerror in -lresolv" >&5
-$as_echo_n "checking for hstrerror in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_hstrerror+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char hstrerror ();
-int
-main ()
-{
-return hstrerror ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_resolv_hstrerror=yes
-else
-  ac_cv_lib_resolv_hstrerror=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_hstrerror" >&5
-$as_echo "$ac_cv_lib_resolv_hstrerror" >&6; }
-if test "x$ac_cv_lib_resolv_hstrerror" = xyes; then :
-  LIBS="-lresolv ${LIBS}"
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIO_new in -lcrypto" >&5
 $as_echo_n "checking for BIO_new in -lcrypto... " >&6; }
 if ${ac_cv_lib_crypto_BIO_new+:} false; then :
@@ -6183,7 +6088,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pound $as_me 2.8a, which was
+This file was extended by pound $as_me 2.8+github, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6245,7 +6150,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pound config.status 2.8a
+pound config.status 2.8+github
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"