Wireshark-commits: [Wireshark-commits] rev 48120: / /trunk-1.6/epan/dissectors/: packet-json.c pack
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=48120
User: gerald
Date: 2013/03/05 04:23 PM
Log:
Copy over revisions from the trunk:
------------------------------------------------------------------------
r47725 | mmann | 2013-02-17 16:58:21 -0800 (Sun, 17 Feb 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-ssl.c
Bugfix data combined via ssl_desegment_app_data not visible via "Follow SSL Stream"
From Joe McEachern, bug 6434 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6434)
------------------------------------------------------------------------
r47872 | jake | 2013-02-24 22:48:35 -0800 (Sun, 24 Feb 2013) | 3 lines
Changed paths:
M /trunk/epan/dissectors/packet-json.c
Fix for bug 7939:
Register application/json-rpc and application/jsonrequest media types for JSON.
------------------------------------------------------------------------
Copy over with manual intervention:
------------------------------------------------------------------------
r47877 | mmann | 2013-02-25 09:32:25 -0800 (Mon, 25 Feb 2013) | 3 lines
Changed paths:
M /trunk/epan/epan.c
M /trunk/epan/wslua/wslua.h
M /trunk/epan/wslua/wslua_field.c
Bugfix Lua pinfo.cols.protocol not holding value in postdissector
From Hadriel Kaplan, bug 6020 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6020)
------------------------------------------------------------------------
Update the release notes.
Directory: /trunk-1.6/epan/dissectors/
Changes Path Action
+2 -0 packet-json.c Modified
+1 -0 packet-ssl.c Modified
Directory: /trunk-1.6/docbook/
Changes Path Action
+21 -1 release-notes.xml Modified
Directory: /trunk-1.6/epan/
Changes Path Action
+3 -0 epan.c Modified
Directory: /trunk-1.6/epan/wslua/
Changes Path Action
+1 -0 wslua.h Modified
+17 -0 wslua_field.c Modified
