Rule engine: Reworded confusing log message for the case when the previous defniition of a rule with the same ID has a different phase.
Work around sporatic libhtp callbacks after close
Squashed 'libs/libinjection/' changes from 537c705..85cc4c0

85cc4c0 Add sqli_fingerprints.h
875c2d2 fix coverage?
a7a189b fix code coverage
3a8cfa6 prevent command line running
79c574c Issue #23: fix for read-past-end in number parsing
2c05cb8 test for end-of-line in exponential formation 1E+
c30970c Issue #23: read-past-end errors
a1db2ab Issue #23: fix read-past-end error
ce9abe7 odds and ends for valgrind
03a4902 xml valgrind fix
f1383bd add valgrind xml output
586358f add valgrind xml output
eff87f2 update text
54d90ad Make a copy of input string without ending null byte, so valgrind can detect over-runs
2b5040d fix valgrind and unit tests
0931002 more money $ tests
742de27 Issue #5: parse $money types
15ea089 Issue #5: parse $money types
41a2149 Issue #5: parse $money types
4b930d9 update test failure output
6e0efda update test failure output
59a9937 fix up make test_unit
3bb1d7b switch to nosetests for getting xunit output, etc
e286c15 ignore nosetest xml files
c0a921a fix profiling build, take 2
12bba69 fix profiling build
0cd7451 sort
acb85d2 Issue #12: make json data file format
d5f9a4e fix names to be more standard
65b2417 remove bogus sqli
cddd302 put sqli fingerprint in xml test output
d886daf add fingerprint to xml output
21188af fix testing of false-negatives
0ee93d3 xml escape output before going in xml
916ef34 Issue:19 patch to let sqlparse.c build on windows
3b28dc7 Fix unit tests due to test-driver change
9c3d805 new fingerprinting helper tool
131f52b remove mem allocation and free
e695600 remove upcasing... not needed anymore
f759afd fingerprint updates from last sqlmap run
20a11f9 add new output from latest sqlmap
977e312 help with a false positive case
c3decdc minor change to make grepping easier
7b9f7e4 cleanup
ba58cfa remove dead code, make c89 compatible, fix SELECT.1 parsing
d21043b C89 compatibile, fix loop bug
947218c tests for issue#16 -- select.1 --> select .1, etc
9ea127f tests for issue#16 -- select.1 --> select .1, etc
86ea642 gprof test
f81aa32 gprof
d6f8154 grof x100
24da427 more gprof
4a45ae5 grof take 10000
6bad4a9 grpof take 6
1ea5215 gprof take 5
131466d gprof take 4
14cde4d update gprof
3e2b771 gprof take 3
0a4ab75 gprof take 2
b3e80c6 take 1 on gprof
467b5e6 add new fingerprint
082339c add new test case
8ac8eea use in-house version of memmem
0c8b90e update BSD license
3c48056 is input is 0, return false, its not sqli
f14c451 nits
b055e97 nits
56af9d3 nits
352f271 fix python nit
965b4bd fix python nit
c58c055 fix double encoded entry in test samples
d28ba46 fix double encoded entry in test samples
c9a3f69 remove use of "bool" due to microsoft
1e6a0c9 completely case insensitive now
361f76d fix unit test
3d7f0bf always return 0
51735a8 Make reader emit output in cppstyle xml format for jenkins
0ecaff2 nits
b21a604 comments and whitespace only
e305d76 more nits
50a1344 more nits
8f2501b more python nits
4a12881 fix python nits
f4e578a yet more cleanups
c5e4f84 more cleanups
ed9daa9 eat own dog food and use json file for input, not python
400c8d3 fix build
cba6475 minor cleanup
757afc9 fix gcovr
69ecb3f remove dead code
740afe4 remove test program from code coverage report
24655ee Improve JSON output
2a8f9fa Generate JSON output
766a39f Fix Issue 15, left/right joins not parsed correctly (benign)
c941df0 fix test driver to work on python older than 2.7
2f4bc4a fix test driver to work on python older than 2.7
c312d3c cleanup dead code
f515322 more makefile fixes
a6cc38a undo whitelisting of some patterns.. thanks mysql
9d5d351 removus bogus entry
1aae61c More unpleasant mysqli conversion issues
a91f9b7 comment out troublemarkers
a0821f9 part 1 of MS style parsing, folding improvements, adding fingerprints
ea39157 comment out trouble makers
832d842 comment out trouble makers
d9b00d7 reduce FN
d2585ef add current year
50b3f89 fix dependencies in makefile
83e0d0f make new rule for cppcheck
2200e16 poke
7930783 update copyright
c0388eb test
9e3c904 add tests for mysql implcitit type conversion attacks
9641838 another change for test coverage
c74f3b1 keep going on test failures for code coverage
4fd3ad5 more makefile fixes
c9be0ea more makefile fixes
c665292 more code coverage
4909196 fix exclude pattern
25dbb34 Fix up gcov
1ef099e take 3 on code coverage
a754a07 fix makefile
8bfb3a5 atempt to use gcovr for coverage
ef52f4f fix code coverage in makefile
48997c4 more nits
5ef613c more cleanups in python code
9b3a773 put into function
8b283dc redo style fix
b036a49 more cleanups
6722f5b remove cppcheck xml files on make clean
14dc17d fix some c/c++ style warnings
1ada6ee fix C++ support
b8f9755 fix up GNU_SOURCE stuff
c102c16 update to latest
6b48471 Fix memmem usage
ca78806 Fail on any warning
e6a1ace make all binary exes from makefile
b2cb2d3 fix C++ compatibility
f234dc1 improve english comments
599dfe0 handle more "SOS" cases.  Has too many FP, but will work on that tomorrow
5260389 add s&s, or ...." & "... to list
bd1bf33 add "not rlike" and "not regexp" as single operators
a89cd82 new tests for mysql bizarro logic
5bceaeb minor additions of sqli
036e6c6 Issue 10: fold harder... obfuscation by parens and unary ops will be harder now
c63f893 add some new variations of obfuscation by parens and unary ops
61aec9f fix core dump on testing script (not libinjection)
75bed44 remove debug, fix issue 8, strstr is forbidden, issue 9 pgsql nested comments
3365480 fix unit test broken in last commit, add new test for pgsql unit tests
fc3a325 Close Issue 7.  Keep more info on how strings are started and ended
65e357e add comment-line url-encode script

git-subtree-dir: libs/libinjection
git-subtree-split: 85cc4c037b865e7b0b336d0a6f3df5b6b6c5e81f
Merge upstream libinjection into 0.7.x

Conflicts:
	libs/libinjection/c/sqli_fingerprints.h
libinjection: Update code and docs with upstream changes.
Magic trafficserver sauce:
create reader BEFORE TSHttpHdrPrint loses data pointer in iobuf