[gerald@xxxxxxxxxxxxx]

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

User: gerald
Date: 2011/10/25 03:47 PM

Log:
 Copy over revisions from the trunk:
 
   ------------------------------------------------------------------------
   r39311 | alagoutte | 2011-10-08 09:55:54 -0700 (Sat, 08 Oct 2011) | 6 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ieee80211.c
 
   From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6420
   WPA IE pairwise cipher suite dissector uses incorrect value_string list
 
   From me :
   * Use correct value_string for WPA Key MGMT...
   ------------------------------------------------------------------------
   r39388 | guy | 2011-10-12 10:53:58 -0700 (Wed, 12 Oct 2011) | 8 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ajp13.c
 
   From Iain Arnell:
 
   Revision 35984 introduced a regression in ajp13_get_nstring. According
   to the comments here, the returned length _includes_ the trailing null.
   The encoded length, however, does _not_ including the trailing null.
   This patch resolves the problem by simply adding 1 to the returned
   length.
   ------------------------------------------------------------------------
   r39390 | guy | 2011-10-12 10:55:49 -0700 (Wed, 12 Oct 2011) | 9 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ajp13.c
 
   From Iain Arnell:
 
   A missing value_ptr parameter in the handling of ajp13 response headers
   led to them being displayed differently than the request headers.
 
   This patch also simplifies the offset/length calculation for header
   values, and skips the size for consistency with handling of other ajp13
   string values.
   ------------------------------------------------------------------------
   r39392 | wmeier | 2011-10-12 11:04:58 -0700 (Wed, 12 Oct 2011) | 12 lines
   Changed paths:
      M /trunk/wiretap/file_access.c
      M /trunk/wiretap/network_instruments.c
 
   From Robert Bullen: Fix for: Two minor bugs in Wiretap library:
 
   First bug: The Network Instruments Observer file format abbreviation is
   incorrect. It is "niobserverv" instead of "niobserver", which is probably a
   vestige from 1.4 when the abbreviation was "niobserverv9".
 
   Second bug: The packet header magic number field is correctly swapped the first
   time when reading the entire packet header. It is incorrectly swapped yet again
   when reporting an invalid value. Both swaps use GUINT_FROM_LE, which is a no-op
   on little-endian platforms. But the error message that is displayed to users of
   big-endian platforms will contain a byte-reversed value.
   ------------------------------------------------------------------------
 
 
 Copy over by hand:
 
   ------------------------------------------------------------------------
   r39416 | guy | 2011-10-14 00:45:22 -0700 (Fri, 14 Oct 2011) | 8 lines
   Changed paths:
      M /trunk/epan/dissectors/packet-ajp13.c
 
   From Iain Arnell:
 
   AJP13 uses a string size of 0xFFFF to indicate a null string;
   ajp13_get_nstring function would incorrectly return invalid data.
 
   In disaply_req_body function, the content_length really is the length of
   the data; there is no trailing null.
   ------------------------------------------------------------------------
 
 
 Update the release notes.

Directory: /trunk-1.6/epan/dissectors/
  Changes    Path                  Action
  +14 -18    packet-ajp13.c        Modified
  +2 -2      packet-ieee80211.c    Modified

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

Directory: /trunk-1.6/wiretap/
  Changes    Path                     Action
  +1 -1      file_access.c            Modified
  +11 -11    network_instruments.c    Modified