[gerald@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=36571

User: gerald
Date: 2011/04/11 05:02 PM

Log:
 Copy over revisions from the trunk:
 
 ------------------------------------------------------------------------
 r36160 | cmaynard | 2011-03-07 13:58:30 -0800 (Mon, 07 Mar 2011) | 6 lines
 Changed paths:
    M /trunk/tap-comparestat.c
 
 Allow <interval> to be successfully sscanf'd no matter the locale for the
 decimal symbol.  Similar to the fix made to tap-iostat.c to resolve bug 2880.
 
 Motivated by the discussion started from this thread on the user list:
 http://www.wireshark.org/lists/wireshark-users/201103/msg00018.html
 ------------------------------------------------------------------------
 r36162 | sake | 2011-03-08 03:26:34 -0800 (Tue, 08 Mar 2011) | 3 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tcp.c
 
 Fix for bug 5743 : tshark incorrectly calculates tcp stream for SYN packets when port numbers are re-used
 ------------------------------------------------------------------------
 r36166 | cmaynard | 2011-03-08 06:57:38 -0800 (Tue, 08 Mar 2011) | 3 lines
 Changed paths:
    M /trunk/gtk/compare_stat.c
 
 Allow <variance> to be successfully sscanf'd no matter the locale for the
 decimal symbol.  Same change and reason as for revision 36160.
 ------------------------------------------------------------------------
 r36174 | wmeier | 2011-03-08 16:43:49 -0800 (Tue, 08 Mar 2011) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-ssl-utils.c
 
 Check that imported private key is RSA; Prevents a crash.
 
 Fixes Bug #5662
 
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5662
 ------------------------------------------------------------------------
 r36177 | cmaynard | 2011-03-11 17:32:35 -0800 (Fri, 11 Mar 2011) | 2 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sflow.c
 
 Handle PPP in HDLC framing.  Fixes bug 5746.
 ------------------------------------------------------------------------
 r36178 | sfisher | 2011-03-11 18:06:25 -0800 (Fri, 11 Mar 2011) | 6 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-sflow.c
 
 Improve r36177 per Guy's suggestion at bug #5746 to always call the
 PPP-over-HDLC dissector since it will do the check for us to see if
 the HDLC framing is present or not.
 ------------------------------------------------------------------------
 r36226 | wmeier | 2011-03-21 10:07:18 -0700 (Mon, 21 Mar 2011) | 4 lines
 Changed paths:
    M /trunk/pcapio.c
 
 Don't close file handle if a file write error; (caller does the close)
 
 Fixes "USE_AFTER_FREE" defect reported by Coverity Prevent.
 ------------------------------------------------------------------------
 r36232 | sake | 2011-03-21 15:04:22 -0700 (Mon, 21 Mar 2011) | 3 lines
 Changed paths:
    M /trunk/wiretap/netscreen.c
 
 Fix for bug 5762, wireshark asserts on reading juniper snoop output when no hex data is present (snoop detail off).
 ------------------------------------------------------------------------
 r36470 | etxrab | 2011-04-04 22:50:45 -0700 (Mon, 04 Apr 2011) | 3 lines
 Changed paths:
    M /trunk/capinfos.c
 
 From Jose Pedro Oliveira:
 #ifdef HAVE_LIBGCRYPT block includes a line too many.
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5803
 ------------------------------------------------------------------------
 r36471 | tuexen | 2011-04-05 07:28:33 -0700 (Tue, 05 Apr 2011) | 3 lines
 Changed paths:
    M /trunk/text2pcap.c
 
 Fix a typo in the help message.
 Reported by Matthias Wellmeyer.
 ------------------------------------------------------------------------
 r36498 | sfisher | 2011-04-06 09:34:45 -0700 (Wed, 06 Apr 2011) | 5 lines
 Changed paths:
    M /trunk/docbook/check_svn_version.sh
 
 From Peter via bug #5798: Don't try to run svnversion if it isn't
 executable.
 ------------------------------------------------------------------------
 r36554 | cmaynard | 2011-04-11 06:44:31 -0700 (Mon, 11 Apr 2011) | 2 lines
 Changed paths:
    M /trunk/epan/libwireshark.def
 
 Add proto_field_is_referenced.  Fixes bug 5816.
 ------------------------------------------------------------------------
 
 
 Copy over with manual intervenion:
 
 ------------------------------------------------------------------------
 r36190 | gerald | 2011-03-14 09:00:51 -0700 (Mon, 14 Mar 2011) | 2 lines
 Changed paths:
    M /trunk/asn1/ldap/ldap.cnf
    M /trunk/epan/dissectors/packet-ldap.c
 
 Properly initialize our filter counters.
 ------------------------------------------------------------------------
 r36330 | morriss | 2011-03-25 08:45:37 -0700 (Fri, 25 Mar 2011) | 8 lines
 Changed paths:
    M /trunk/epan/dissectors/packet-tcp.c
 
 Fix the problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3785#c14 :
 
 If we thought we finished reassembly (and called the subdissector) only to find
 out that the subdissector asked for more data, handle the case where the
 subdissector asked for DESEGMENT_UNTIL_FIN.  Previously we only handled the
 possibility that the subdissector would ask for a specific number of bytes or
 DESEGMENT_ONE_MORE_SEGMENT.
 ------------------------------------------------------------------------

Directory: /trunk-1.4/epan/dissectors/
  Changes    Path                  Action
  +30 -26    packet-ldap.c         Modified
  +36 -36    packet-mysql.c        Modified
  +4 -4      packet-sflow.c        Modified
  +14 -0     packet-ssl-utils.c    Modified
  +6 -3      packet-tcp.c          Modified

Directory: /trunk-1.4/docbook/
  Changes    Path                    Action
  +1 -1      check_svn_version.sh    Modified
  +54 -0     release-notes.xml       Modified

Directory: /trunk-1.4/epan/
  Changes    Path                Action
  +1 -0      libwireshark.def    Modified

Directory: /trunk-1.4/gtk/
  Changes    Path              Action
  +4 -1      compare_stat.c    Modified

Directory: /trunk-1.4/asn1/ldap/
  Changes    Path          Action
  +4 -0      ldap.cnf      Modified


(5 files not shown)