Merge branch 'master' into HTTPSizeT

Conflicts: src/HTTPServer/EnvelopeParser.h src/HTTPServer/HTTPFormParser.h src/HTTPServer/MultipartParser.h
2014-04-02 07:51:48 -07:00
parent 741a64c250 5c6d474599
commit 0075b2f72e
24 changed files with 45 additions and 30 deletions
--- a/src/HTTPServer/MultipartParser.h
+++ b/src/HTTPServer/MultipartParser.h
@@ -22,6 +22,7 @@ public:
 	class cCallbacks
 	{
 	public:
+		// Force a virtual destructor in descendants:
 		virtual ~cCallbacks() {}
 		
 		/** Called when a new part starts */