Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Add check for optional HTTP::Info status_code.
  Changing some external testing scripts.

Conflicts:
	scripts/base/protocols/http/main.bro

CHANGES

@@ -1,4 +1,30 @@
 
+1.6-dev-1352 | 2011-10-05 16:20:51 -0700
+
+  * Fix for optional HTTP::Info status_code. (Jon Siwek)
+
+  * Teaking some external testing scripts. (Jon Siwek)
+
+  * HTTP bug fix reported by Martin Holste. (Seth Hall)
+
+  * More script tuning. (Seth Hall)
+
+    - Moved some of the weird events back to the base/ directory.
+
+    - SSL fixes, updates, and performance optimization.
+
+  * More adjustment to reduce Weird volumes. (Seth Hall)
+
+  * Fixed an error when calculating x509 certificate hashes (reported
+    by Martin Holste). (Seth Hall)
+
+  * Clean up to cluster framework to make event handling clearer.
+    (Seth Hall)
+
+  * Fixed a bug in the notice framework. (Seth Hall)
+
+  * Bug fix for FTP analysis script. (Seth Hall)
+
 1.6-dev-1333 | 2011-09-29 22:29:51 -0700
 
   * Fixing a number of memory leaks. (Robin Sommer)

VERSION

@@ -1 +1 @@
-1.6-dev-1333
+1.6-dev-1352

scripts/base/protocols/http/main.bro

@@ -266,8 +266,7 @@ event http_message_done(c: connection, is_orig: bool, stat: http_message_stat) &
 		{
 		# If the response was an informational 1xx, we're still expecting
 		# the real response later, so we'll continue using the same record.
-		if ( c$http?$status_code && 
-			 ! code_in_range(c$http$status_code, 100, 199) )
+		if ( ! (c$http?$status_code && code_in_range(c$http$status_code, 100, 199)) )
 			{
 			Log::write(HTTP::LOG, c$http);
 			delete c$http_state$pending[c$http_state$current_response];

testing/external/scripts/diff-all

@@ -15,12 +15,14 @@ fi
 rc=0;
 
 for i in $@; do
-    if ! btest-diff $i; then
-       echo "" >>$diag
-       echo "#### btest-diff $i" >>$diag
-       echo "" >>$diag
-       cat $diag.tmp >>$diag
-       rc=1
+    if [[ "$i" != "loaded_scripts.log" && "$i" != "prof.log" ]]; then
+        if ! btest-diff $i; then
+           echo "" >>$diag
+           echo "#### btest-diff $i" >>$diag
+           echo "" >>$diag
+           cat $diag.tmp >>$diag
+           rc=1
+        fi
     fi
 done
 

testing/scripts/diff-canonifier-external

@@ -5,4 +5,3 @@
 `dirname $0`/diff-remove-timestamps \
     | `dirname $0`/diff-remove-uids \
     | `dirname $0`/diff-remove-mime-types \
-    | `dirname $0`/diff-remove-abspath