[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2013/09/09 04:46 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r51360 | eapache | 2013-08-14 19:06:49 -0700 (Wed, 14 Aug 2013) | 6 lines
   Changed paths:
      M /trunk/plugins/ethercat/packet-ams.c
 
   As suggested by Volcke Mario, fixing
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9036
 
   Don't change the length *and* the offset when adjusting for the ethercat header,
   just the offset is enough (the length is then right).
   ------------------------------------------------------------------------
   r51493 | gerald | 2013-08-23 11:42:51 -0700 (Fri, 23 Aug 2013) | 3 lines
   Changed paths:
      M /trunk/rawshark.c
 
   Initialize our wtap_pkthdr struct so that we don't try to dereference an
   invalid opt_comment pointer down the line.
   ------------------------------------------------------------------------
   r51785 | eapache | 2013-09-05 08:48:50 -0700 (Thu, 05 Sep 2013) | 4 lines
   Changed paths:
      M /trunk/epan/req_resp_hdrs.c
 
   As per the HTTP spec, prefer chunked transfer-encoding to content-length if we
   get both. Fixes reassembly for
   https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101
   ------------------------------------------------------------------------
   r51789 | cmaynard | 2013-09-05 11:51:46 -0700 (Thu, 05 Sep 2013) | 6 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-gtpv2.c
 
   Display "TEID/GRE Key" field consistently as hexadecimal since 3GPP TS 36.444 says this field is of type, "octet string".
 
   Ref: http://ask.wireshark.org/questions/24221/decode-gtpv2-teid-as-decimal-or-hex
 
   #BACKPORT(1.10,1.8)
   ------------------------------------------------------------------------
   r51566 | jmayer | 2013-08-28 11:27:16 -0700 (Wed, 28 Aug 2013) | 4 lines
   Changed paths:
      M /trunk/make-version.pl
 
   svn version 1.7.11 no longer has local .svn directories,
   just one at the top level. So on my system, /trunk no longer
   contains a .svn directory. Check in parent directory as well.
   ------------------------------------------------------------------------
   r51872 | stig | 2013-09-09 10:49:22 -0700 (Mon, 09 Sep 2013) | 6 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_tvb.c
 
   Removed return value from ByteArray append and prepend, as this did push
   the same ByteArray twice (and thus calling the GC twice).
   This should fix bug 4461.
 
   Changed ByteArray concat to create a new array to be returned.
   ------------------------------------------------------------------------
 
 
 Copy over with manual intervention:
 
   ------------------------------------------------------------------------
   r51448 | cmaynard | 2013-08-20 15:42:46 -0700 (Tue, 20 Aug 2013) | 9 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ncp-sss.c
 
   Simplify find_delimiter() by making use of tvb_find_guint8().
   In sss_string():
    -> Protect against tvb_length_remaining() possibly returning -1.
    -> Fix off-by-1 potential buffer overflow condition.
    -> Use isprint() rather than "do-it-yourself" code.
    -> Remove the extra unnecessary "length_remaining" checks in the for() loop.
 
   #BACKPORT(1.10, 1.8)
   ------------------------------------------------------------------------
   r51815 | stig | 2013-09-07 03:56:52 -0700 (Sat, 07 Sep 2013) | 3 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_proto.c
 
   Added syntax and range checks for Lua Prefs.range default values.
   Fixed some small memory leakages.
   ------------------------------------------------------------------------
   r51899 | stig | 2013-09-09 14:20:26 -0700 (Mon, 09 Sep 2013) | 4 lines
   Changed paths:
      M /trunk/epan/wslua/wslua_field.c
 
   Initialize all tvb values in FieldInfo_get_range.
 
   This fixes bug 5200.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.8/epan/dissectors/
  Changes    Path                Action
  +1 -1      packet-gtpv2.c      Modified
  +63 -93    packet-ncp-sss.c    Modified

Directory: /trunk-1.8/docbook/
  Changes    Path                 Action
  +28 -0     release-notes.xml    Modified

Directory: /trunk-1.8/epan/
  Changes    Path               Action
  +38 -38    req_resp_hdrs.c    Modified

Directory: /trunk-1.8/plugins/ethercat/
  Changes    Path            Action
  +0 -1      packet-ams.c    Modified

Directory: /trunk-1.8/
  Changes    Path               Action
  +1 -1      make-version.pl    Modified
  +2 -0      rawshark.c         Modified

Directory: /trunk-1.8/epan/wslua/
  Changes    Path             Action
  +2 -0      wslua_field.c    Modified
  +27 -7     wslua_proto.c    Modified
  +7 -6      wslua_tvb.c      Modified