Merged revisions 317255 via svnmerge from

Merged revisions 317255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r317255 | russell | 2011-05-05 13:29:53 -0500 (Thu, 05 May 2011) | 22 lines

  Merged revisions 317211 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r317211 | russell | 2011-05-05 13:20:29 -0500 (Thu, 05 May 2011) | 15 lines

    chan_sip: fix broken realtime peer count, fix memory leak

    This patch addresses two bugs in chan_sip:

    1) The count of realtime peers and users was off.  The increment checked the
    value of the caching option, while the decrement did not.

    2) Add a missing regfree() for a regex.

    (closes issue #19108)
    Reported by: vrban
    Patches:
          missing_regfree.patch uploaded by vrban (license 756)
          sip_object_counter.patch uploaded by vrban (license 756)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@317281 65c4cc65-6c06-0410-ace0-fbb531ad65f3