Merge remote-tracking branch 'origin/topic/dnthayer/ticket1719'

BIT-1719 #merged

* origin/topic/dnthayer/ticket1719:
  Fix httpd.py test script for Py3 compatibility

CHANGES

@@ -1,4 +1,20 @@
 
+2.5-beta-64 | 2016-10-10 08:20:42 -0700
+
+  * Fix httpd.py test script for Py3 compatibility. (Daniel Thayer)
+
+  * Tiny fix for a DCE_RPC script issue. Fixes BIT-1688. (Seth Hall)
+
+  * Fix for plugins/hooks test. (Johanna Amann)
+
+  * Update a TLS constants in preparation for TLS 1.3, and rename a
+    few names that had never been formally assigned yet. (Johanna
+    Amann)
+
+  * Fixing Broxygen indexing confusion for plugins. Broxygen now
+    indexes plugin scripts as, e.g., "Bro_Netmap/scripts/init.bro".
+    Addresses BIT-1693. (Robin Sommer)
+
 2.5-beta-54 | 2016-10-06 14:24:01 -0700
 
   * Fixing documentation piece on the interesting-hostname script.

VERSION

@@ -1 +1 @@
-2.5-beta-54
+2.5-beta-64

aux/btest

@@ -1 +1 @@
-Subproject commit fb5bf8d9e11d2f4a59a191d732130e6637867542
+Subproject commit 625dbecfd63022d79a144b9651085e68cdf99ce4

testing/scripts/httpd.py

@@ -1,7 +1,11 @@
 #! /usr/bin/env python
 
-import BaseHTTPServer
-
+try:
+    # Python 2
+    import BaseHTTPServer
+except ImportError:
+    # Python 3
+    import http.server as BaseHTTPServer
 
 class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
@@ -11,9 +15,9 @@ class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         self.end_headers()
 
         if "/empty" in self.path:
-            self.wfile.write("")
+            self.wfile.write(b"")
         else:
-            self.wfile.write("It works!")
+            self.wfile.write(b"It works!")
 
     def do_POST(self):
         self.send_response(200)
@@ -21,9 +25,9 @@ class MyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         self.end_headers()
 
         if "/empty" in self.path:
-            self.wfile.write("")
+            self.wfile.write(b"")
         else:
-            self.wfile.write("It works!")
+            self.wfile.write(b"It works!")
 
     def version_string(self):
         return "1.0"