Reset inactivity timeout in SSL read loop.

LICENSE

@@ -425,3 +425,129 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+~~~
+
+  LICENSE ISSUES
+  ==============
+
+  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
+  the OpenSSL License and the original SSLeay license apply to the toolkit.
+  See below for the actual license texts.
+
+  OpenSSL License
+  ---------------
+
+/* ====================================================================
+ * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+
+ Original SSLeay License
+ -----------------------
+
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ *
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ *
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
+

Makefile.am

@@ -57,8 +57,7 @@ doxygen:
 	@cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
 
 changelog:
-	./tools/changelog.pl $(VERSION) > CHANGELOG-$(VERSION)
-	-git add CHANGELOG-$(VERSION) && git commit -m "Adding CHANGELOG-$(VERSION)"
+	./tools/changelog.pl apache trafficserver $(VERSION) > CHANGELOG-$(VERSION)
 
 asf-dist: asf-distdir
 	tardir=$(distdir) && $(am__tar) --mtime=./configure.ac | bzip2 -9 -c >$(distdir).tar.bz2
@@ -102,6 +101,9 @@ install-data-hook:
 rat:
 	java -jar $(top_srcdir)/ci/apache-rat-0.11-SNAPSHOT.jar -E $(top_srcdir)/ci/rat-regex.txt  -d $(top_srcdir)
 
+autopep8:
+	@autopep8 -i -r $(top_srcdir)
+
 #
 # These are rules to make clang-format easy and fast to run. Run it with e.g.
 #    make -j clang-format
@@ -163,3 +165,4 @@ help:
 	@echo 'rel-candidate    recreate a signed relelease candidate source package and a signed git tag'
 	@echo 'release          recreate a signed release source package and a signed git tag'
 	@echo 'tidy             run clang-tidy in fix-it mode'
+	@echo 'autopep8         run autopep8 over python files'

NOTICE

@@ -103,3 +103,9 @@ Copyright 2014 Google Inc. All Rights Reserved.
 
 plugins/experimental/memcache/protocol_binary.h developed by Sun Microsystems, Inc.
 Copyright (c) <2008>, Sun Microsystems, Inc.  All rights reserved.
+
+~~
+
+Reusable Gold Testing System  
+https://bitbucket.org/dragon512/reusable-gold-testing-system
+Copyright (c) 2015-2016 Jason Kenny All Rights Reserved.

build/crypto.m4

@@ -22,7 +22,7 @@ dnl
 dnl TS_CHECK_CRYPTO: look for crypto libraries and headers
 dnl
 AC_DEFUN([TS_CHECK_CRYPTO], [
-  AC_SEARCH_LIBS([crypt], [crypt], [AC_SUBST([LIBCRYPT],["-lcrypt"])])
+  AC_CHECK_LIB([crypt], [crypt], [AC_SUBST([LIBCRYPT],["-lcrypt"])])
 
   AX_CHECK_OPENSSL([
     enable_crypto=yes

build/lzma.m4

@@ -84,7 +84,7 @@ if test "$enable_lzma" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${lzma_ldflags}])
     TS_ADDTO_RPATH(${lzma_ldflags})
   fi
-  AC_SEARCH_LIBS([lzma_code], [lzma], [lzma_have_libs=1])
+  AC_CHECK_LIB([lzma], [lzma_code], [lzma_have_libs=1])
   if test "$lzma_have_libs" != "0"; then
     AC_CHECK_HEADERS(lzma.h, [lzma_have_headers=1])
   fi

build/pcre.m4

@@ -95,7 +95,7 @@ if test "$enable_pcre" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${pcre_ldflags}])
     TS_ADDTO_RPATH(${pcre_ldflags})
   fi
-  AC_SEARCH_LIBS([pcre_exec], [pcre], [pcre_have_libs=1])
+  AC_CHECK_LIB([pcre], [pcre_exec], [pcre_have_libs=1])
   if test "$pcre_have_libs" != "0"; then
     AC_CHECK_HEADERS(pcre.h, [pcre_have_headers=1])
     AC_CHECK_HEADERS(pcre/pcre.h, [pcre_have_headers=1])

build/zlib.m4

@@ -84,7 +84,7 @@ if test "$enable_zlib" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${zlib_ldflags}])
     TS_ADDTO_RPATH(${zlib_ldflags})
   fi
-  AC_SEARCH_LIBS([compressBound], [z], [zlib_have_libs=1])
+  AC_CHECK_LIB([z], [compressBound], [zlib_have_libs=1])
   if test "$zlib_have_libs" != "0"; then
     AC_CHECK_HEADERS(zlib.h, [zlib_have_headers=1])
   fi

ci/jenkins/bin/gh-mirror.sh

@@ -67,17 +67,17 @@ function checkBuild() {
 }
 
 # Save away previous ref-specs, you must save all branches
-REF_4_2=$(getRef "4.2.x")
 REF_6_2=$(getRef "6.2.x")
 REF_7_0=$(getRef "7.0.x")
+REF_7_1=$(getRef "7.1.x")
 REF_master=$(getRef "master")
 
 # Do the updates
 ${GIT} remote update --prune > /dev/null 2>&1
 ${GIT} update-server-info
 
 # Check the branches, this makes assumptions that the Jenkins build are named after the branches
-checkBuild "$REF_4_2" "4.2.x"
 checkBuild "$REF_6_2" "6.2.x"
 checkBuild "$REF_7_0" "7.0.x"
+checkBuild "$REF_7_1" "7.1.x"
 checkBuild "$REF_master" "master"

ci/rat-regex.txt

@@ -22,6 +22,7 @@
 .*\.default$
 .*\.default\.in$
 .*\.config$
+.*\.gold$
 ^\.gitignore$
 ^\.gitmodules$
 ^\.indent.pro$

ci/tsqa/tests/test_body_factory.py

@@ -40,7 +40,8 @@ def setUpEnv(cls, env):
         cls.configs['remap.config'].add_line(
             'map / http://www.linkedin.com/ @action=deny'
         )
-        cls.body_factory_dir = os.path.join(cls.environment.layout.prefix, cls.configs['records.config']['CONFIG']['proxy.config.body_factory.template_sets_dir'])
+        cls.body_factory_dir = os.path.join(cls.environment.layout.prefix,
+                                            cls.configs['records.config']['CONFIG']['proxy.config.body_factory.template_sets_dir'])
         cls.domain_directory = ['www.linkedin.com', '127.0.0.1', 'www.foobar.net']
         for directory_item in cls.domain_directory:
             current_dir = os.path.join(cls.body_factory_dir, directory_item)
@@ -50,24 +51,24 @@ def setUpEnv(cls, env):
                 pass
             fname = os.path.join(current_dir, "access#denied")
             with open(fname, "w") as f:
-              f.write(directory_item)
+                f.write(directory_item)
             fname = os.path.join(current_dir, ".body_factory_info")
             with open(fname, "w") as f:
-              pass
+                pass
 
     def test_domain_specific_body_factory(self):
-      times = 1000
-      no_dir_domain = 'www.nodir.com'
-      self.domain_directory.append(no_dir_domain)
-      self.assertEqual(4, len(self.domain_directory))
-      url = 'http://127.1.0.1:{0}'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
-      for i in xrange(times):
-          domain = random.choice(self.domain_directory)
-          headers = {'Host': domain}
-          r = requests.get(url, headers=headers)
-          domain_in_response = no_dir_domain
-          for domain_item in self.domain_directory:
-              if domain_item in r.text:
-                   domain_in_response = domain_item
-                   break
-          self.assertEqual(domain, domain_in_response)
+        times = 1000
+        no_dir_domain = 'www.nodir.com'
+        self.domain_directory.append(no_dir_domain)
+        self.assertEqual(4, len(self.domain_directory))
+        url = 'http://127.1.0.1:{0}'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
+        for i in xrange(times):
+            domain = random.choice(self.domain_directory)
+            headers = {'Host': domain}
+            r = requests.get(url, headers=headers)
+            domain_in_response = no_dir_domain
+            for domain_item in self.domain_directory:
+                if domain_item in r.text:
+                    domain_in_response = domain_item
+                    break
+            self.assertEqual(domain, domain_in_response)

ci/tsqa/tests/test_connect_attempts.py

@@ -214,7 +214,8 @@ def test_listen_origin(self):
 
     def test_die_on_connect_origin(self):
         '''Verify that we get 504s from origins that die_on_connect'''
-        url = 'http://127.0.0.1:{0}/die_on_connect/s'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
+        url = 'http://127.0.0.1:{0}/die_on_connect/s'.format(
+            self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
         ret = requests.get(url, timeout=2)
         self.assertEqual(ret.status_code, 504)
 
@@ -225,19 +226,22 @@ def test_partial_response_origin(self):
         We want to bail out-- since the origin already got the request, we can't
         gaurantee that the request is re-entrant
         '''
-        url = 'http://127.0.0.1:{0}/partial_response/s'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
+        url = 'http://127.0.0.1:{0}/partial_response/s'.format(
+            self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
         ret = requests.get(url, timeout=2)
         self.assertEqual(ret.status_code, 500)
 
     def test_reset_after_accept_origin(self):
         '''Verify that we get 502s from origins that reset_after_accept, once any bytes are sent to origin we assume we cannot re-dispatch'''
-        url = 'http://127.0.0.1:{0}/reset_after_accept/s'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
+        url = 'http://127.0.0.1:{0}/reset_after_accept/s'.format(
+            self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
         ret = requests.get(url, timeout=2)
         self.assertEqual(ret.status_code, 502)
 
     def test_slow_response(self):
         '''Verify that we get 5xx from origins that take longer than acceptable, since we will not retry them'''
-        url = 'http://127.0.0.1:{0}/slow_response/s'.format(self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
+        url = 'http://127.0.0.1:{0}/slow_response/s'.format(
+            self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
         ret = requests.get(url, timeout=2)
         # make sure it worked
         self.assertEqual(ret.status_code, 504)

ci/tsqa/tests/test_custom_log.py

@@ -46,21 +46,21 @@ def setUpEnv(cls, env):
         cls.configs['logging.config'].add_line('log.ascii(Format = "%<hii> %<hiih>", Filename = "test_log_field"')
 
     def ip_to_hex(self, ipstr):
-      num_list = ipstr.split('.')
-      int_value = (int(num_list[0]) << 24) + (int(num_list[1]) << 16) + (int(num_list[2]) << 8) + (int(num_list[3]))
-      return hex(int_value).upper()[2:]
+        num_list = ipstr.split('.')
+        int_value = (int(num_list[0]) << 24) + (int(num_list[1]) << 16) + (int(num_list[2]) << 8) + (int(num_list[3]))
+        return hex(int_value).upper()[2:]
 
     def test_log_field(self):
-      random.seed()
-      times = 10
-      for i in xrange(times):
-        request_ip = "127.%d.%d.%d" % (random.randint(1, 255), random.randint(1, 255), random.randint(1, 255))
-        url = 'http://%s:%s' % (request_ip, self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
-        requests.get(url)
-        # get the last line of the log file
-        time.sleep(10)
-        with open(self.log_file_path) as f:
-          for line in f:
-            pass
-        expected_line = "%s %s\n" % (request_ip, self.ip_to_hex(request_ip))
-        self.assertEqual(line, expected_line)
+        random.seed()
+        times = 10
+        for i in xrange(times):
+            request_ip = "127.%d.%d.%d" % (random.randint(1, 255), random.randint(1, 255), random.randint(1, 255))
+            url = 'http://%s:%s' % (request_ip, self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'])
+            requests.get(url)
+            # get the last line of the log file
+            time.sleep(10)
+            with open(self.log_file_path) as f:
+                for line in f:
+                    pass
+            expected_line = "%s %s\n" % (request_ip, self.ip_to_hex(request_ip))
+            self.assertEqual(line, expected_line)