pulled in latest from tom

diff --cc ChangeLog
index 7ec0dd5ba48c822b2cb630fc2842410c793bbccc,51468945e46bbe849560c1456ec144976f845736..2d7b7ba34a62f4d4d4572b8c9ad310af2e6be17c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,3 +1,23 @@@
++101
++-- tweaked startup output
++-- fixed pattern matcher
++-- pulled in latest from Tom
++
 +100
 +-- adding profiling to module
 +-- profile.preprocs is now profile.modules
 +
 +99
 +-- updated wizard
++-- removed service / app id from inspectors
 +
 +98
 +-- initial wizard implementation
 +
 +97
 +-- latest from Tom
 +-- some valgrind fixes
 +
  96
  -- finished default fp selection
  -- added NHttpInspect::get_buf() and related

diff --cc configure.ac
index 9fda8402ba414c655060b920aa449593899eb94b,b343d2311bb0ab60eec9dcc719ac2f49ad617890..6c48b28be8b490b089d68b69578797d0c14558bd
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -25,7 -25,7 +25,7 @@@
  # initialization
  #--------------------------------------------------------------------------
  
- AC_INIT([snort], [2.10.100])
 -AC_INIT([snort], [2.10.096])
++AC_INIT([snort], [2.10.101])
  AC_PREREQ([2.68])
  
  AC_CONFIG_SRCDIR([src/main.h])

diff --cc src/service_inspectors/nhttp_inspect/nhttp_api.cc
index ec35c084a397ba2f9de7839502a18d5a244a22a0,db9420bb68a2d64bc77efc020b1c71d57daba4d2..a62a987dfb4cb98be6a385e9e6934704cda675cc
--- 1/src/service_inspectors/nhttp_inspect/nhttp_api.cc
--- 2/src/service_inspectors/nhttp_inspect/nhttp_api.cc
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.cc
@@@ -1,6 -1,6 +1,6 @@@
  /****************************************************************************
   *
--** Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
++ * Copyright (C) 2014 Cisco and/or its affiliates. All rights reserved.
   * Copyright (C) 2003-2013 Sourcefire, Inc.
   *
   * This program is free software; you can redistribute it and/or modify
@@@ -37,22 -37,16 +37,13 @@@
  #include "nhttp_inspect.h"
  #include "nhttp_api.h"
  
- Module* NHttpApi::nhttp_mod_ctor() { return new NHttpModule; }
- 
- void NHttpApi::nhttp_mod_dtor(Module* m) { delete m; }
 -int16_t NHttpApi::appProtocolId;
--
  const char* NHttpApi::nhttp_myName = "nhttp_inspect";
  
  void NHttpApi::nhttp_init()
  {
      NHttpFlowData::init();
 -    appProtocolId = AddProtocolReference("nhttp");
  }
  
- void NHttpApi::nhttp_term()
- {
- }
- 
  Inspector* NHttpApi::nhttp_ctor(Module* mod)
  {
      const NHttpModule* nhttpMod = (NHttpModule*) mod;

diff --cc src/service_inspectors/nhttp_inspect/nhttp_api.h
index 4335e79020d3ae0446d7a2e8fd0f6081849eecf1,4e4b6ee85507db361bd3c3d47aec9cbb85d4c647..7a4e82211df7546809054fd0ff773c897bf646d3
--- 1/src/service_inspectors/nhttp_inspect/nhttp_api.h
--- 2/src/service_inspectors/nhttp_inspect/nhttp_api.h
+++ b/src/service_inspectors/nhttp_inspect/nhttp_api.h
@@@ -36,21 -38,21 +38,20 @@@
  class NHttpApi {
  public:
      static const InspectApi nhttp_api;
--    static int16_t appProtocolId;
  private:
      NHttpApi() = delete;
-     static Module* nhttp_mod_ctor();
-     static void nhttp_mod_dtor(Module* m);
+     static Module* nhttp_mod_ctor() { return new NHttpModule; };
+     static void nhttp_mod_dtor(Module* m) { delete m; };
      static const char* nhttp_myName;
      static void nhttp_init();
-     static void nhttp_term();
+     static void nhttp_term() {};
      static Inspector* nhttp_ctor(Module* mod);
-     static void nhttp_dtor(Inspector* p);
-     static void nhttp_pinit();
-     static void nhttp_pterm();
-     static void nhttp_sum();
-     static void nhttp_stats();
-     static void nhttp_reset();
+     static void nhttp_dtor(Inspector* p) { delete p; };
+     static void nhttp_pinit() {};
+     static void nhttp_pterm() {};
+     static void nhttp_sum() {};
+     static void nhttp_stats() {};
+     static void nhttp_reset() {};
  };
  
  #endif