August 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.0] Bump to 0.3.0.10
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f67e0dca7..5d4c81598 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.9-dev]) +AC_INIT([tor],[0.3.0.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3b375c85c..b9b52d8f5 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.0.9-dev" +!define VERSION "0.3.0.10" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ba6818fb4..8fe361415 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.9-dev" +#define VERSION "0.3.0.10"

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 514212ed660a85d27dc285874971636f543235f1 Merge: df16f89a8 4f7955d5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Bump to 0.3.0.10
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f67e0dca7..5d4c81598 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.9-dev]) +AC_INIT([tor],[0.3.0.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3b375c85c..b9b52d8f5 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.0.9-dev" +!define VERSION "0.3.0.10" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ba6818fb4..8fe361415 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.9-dev" +#define VERSION "0.3.0.10"

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 9409d98ee930541937c9e6b8e09f7e3097f744c1 Merge: ef592d133 71248800f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0

[tor/master] Bump to 0.3.0.10
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f67e0dca7..5d4c81598 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.9-dev]) +AC_INIT([tor],[0.3.0.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3b375c85c..b9b52d8f5 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.0.9-dev" +!define VERSION "0.3.0.10" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ba6818fb4..8fe361415 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.9-dev" +#define VERSION "0.3.0.10"

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 256c1b73e31c0bfb6e48e404f307ca0eb2516408 Merge: c1edd83dd 71248800f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:39:08 2017 -0400 Merge branch 'maint-0.3.1'

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 71248800f72e8ca438f4c61d2c3715258a1b986a Merge: 9c294d29e 4f7955d5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:38:57 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours merge" to avoid version bump.

1 0

[tor/release-0.3.0] Bump to 0.3.0.10
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 4f7955d5de39f88d736207f7a071996c98ff66c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:38:49 2017 -0400 Bump to 0.3.0.10 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f67e0dca7..5d4c81598 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.0.9-dev]) +AC_INIT([tor],[0.3.0.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 3b375c85c..b9b52d8f5 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.0.9-dev" +!define VERSION "0.3.0.10" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ba6818fb4..8fe361415 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.0.9-dev" +#define VERSION "0.3.0.10"

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 02 Aug '17

02 Aug '17

commit 71248800f72e8ca438f4c61d2c3715258a1b986a Merge: 9c294d29e 4f7955d5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 14:38:57 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "Ours merge" to avoid version bump.

1 0

[websocket/bug18628] Expose the entire ws request instead of just the URL
by dcf＠torproject.org 01 Aug '17

01 Aug '17

commit 02a8eb6d7a236f8b805dbd086f1c46f5dfb51149 Author: Hooman <hoomanm(a)princeton.edu> Date: Fri Jul 28 17:29:04 2017 -0700 Expose the entire ws request instead of just the URL --- websocket/websocket.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/websocket/websocket.go b/websocket/websocket.go index b74e3ae..fac649b 100644 --- a/websocket/websocket.go +++ b/websocket/websocket.go @@ -43,7 +43,6 @@ import ( "net" "net/http" "strings" - "net/url" ) // Settings for potential WebSocket connections. Subprotocols is a list of @@ -88,9 +87,12 @@ type WebSocket struct { // Buffer for message payloads, which may be interrupted by control // messages. messageBuf bytes.Buffer - // Request URL - ReqURL url.URL + // Request + request http.Request +} +func (ws *WebSocket) Request() http.Request { + return ws.request } func applyMask(payload []byte, maskKey [4]byte) { @@ -338,13 +340,6 @@ func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) return } - /* URLs are accepted - if req.URL.Path != "/" { - httpError(w, bufrw, http.StatusNotFound) - return - } - */ - // 2. A |Host| header field containing the server's authority. // We deliberately skip this test. // 3. An |Upgrade| header field containing the value "websocket", @@ -395,7 +390,7 @@ func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) ws.Bufrw = bufrw ws.IsClient = false ws.MaxMessageSize = handler.Config.MaxMessageSize - ws.ReqURL = *req.URL + ws.request = *req // See RFC 6455 section 4.2.2, item 5 for these steps.

1 0