Merge remote-tracking branch 'origin/master' into topic/robin/http-connect

Conflicts:
	scripts/base/protocols/ssl/consts.bro
This commit is contained in:
Robin Sommer 2014-03-02 13:55:13 -08:00
commit 02ab000b81
41 changed files with 249 additions and 756 deletions

View file

@ -1,8 +1,6 @@
# List of HTTP headers pulled from:
# http://annevankesteren.nl/2007/10/http-methods
signature dpd_http_client {
ip-proto == tcp
payload /^[[:space:]]*(OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT|PROPFIND|PROPPATCH|MKCOL|COPY|MOVE|LOCK|UNLOCK|VERSION-CONTROL|REPORT|CHECKOUT|CHECKIN|UNCHECKOUT|MKWORKSPACE|UPDATE|LABEL|MERGE|BASELINE-CONTROL|MKACTIVITY|ORDERPATCH|ACL|PATCH|SEARCH|BCOPY|BDELETE|BMOVE|BPROPFIND|BPROPPATCH|NOTIFY|POLL|SUBSCRIBE|UNSUBSCRIBE|X-MS-ENUMATTS|RPC_OUT_DATA|RPC_IN_DATA)[[:space:]]*/
payload /^[[:space:]]*(GET|HEAD|POST)[[:space:]]*/
tcp-state originator
}
@ -13,5 +11,3 @@ signature dpd_http_server {
requires-reverse-signature dpd_http_client
enable "http"
}