May 2015 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 07 May '15

07 May '15

commit df5c4bffa70cce25c6ae66cf362c4b4c4b1853d0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 7 12:59:04 2015 -0700 fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index 4e7a795..aa7d6df 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -248,6 +248,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -255,7 +261,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor/master] Write the outlines of a WritingTests.txt document
by nickm＠torproject.org 07 May '15

07 May '15

commit 79e85313aa611b599f19fea61c38ff3928e1fd59 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 18 14:03:49 2014 -0400 Write the outlines of a WritingTests.txt document Also, add some sample tests to be examples. --- doc/WritingTests.txt | 167 +++++++++++++++++++++++++++++++++++++++++++++++ src/common/tortls.c | 4 +- src/common/tortls.h | 2 +- src/common/util.c | 2 +- src/common/util.h | 2 +- src/or/buffers.c | 2 +- src/test/test_buffers.c | 55 ++++++++++++++++ src/test/test_util.c | 30 +++++++++ 8 files changed, 258 insertions(+), 6 deletions(-) diff --git a/doc/WritingTests.txt b/doc/WritingTests.txt new file mode 100644 index 0000000..ab6d084 --- /dev/null +++ b/doc/WritingTests.txt @@ -0,0 +1,167 @@ + +Writing tests for Tor: an incomplete guide +========================================== + +Tor uses a variety of testing frameworks and methodologies to try to +keep from introducing bugs. The major ones are: + + 1. Unit tests written in C and shipped with the Tor distribution. + + 2. Integration tests written in Python and shipped with the Tor + distribution. + + 3. Integration tests written in Python and shipped with the Stem + library. Some of these use the Tor controller protocol. + + 4. System tests written in Python and SH, and shipped with the + Chutney package. These work by running many instances of Tor + locally, and sending traffic through them. + + 5. The Shadow network simulator. + +How to run these tests +---------------------- + +=== The easy version + +To run all the tests that come bundled with Tor, run "make check" + +To run the Stem tests as well, fetch stem from the git repository, +set STEM_SOURCE_DIR to the checkout, and run "make test-stem". + +To run the Chutney tests as well, fetch chutney from the git repository, +set CHUTNEY_PATH to the checkout, and run "make test-network". + +=== Running particular subtests + +XXXX WRITEME + +=== Finding test coverage + +When you configure Tor with the --enable-coverage option, it should +build with support for coverage in the unit tests, and in a special +"tor-cov" binary. If you launch + +XXXX "make test-network" doesn't know about "tor-cov"; you don't get +XXXX coverage from that yet, unless you do "cp src/or/tor-cov +XXXX src/or/tor" before you run it. + +What kinds of test should I write? +---------------------------------- + +XXXX writeme. + + +Unit and regression tests: Does this function do what it's supposed to? +----------------------------------------------------------------------- + +Most of Tor's unit tests are made using the "tinytest" testing framework. +You can see a guide to using it in the tinytest manual at + + https://github.com/nmathewson/tinytest/blob/master/tinytest-manual.md + +To add a new test of this kind, either edit an existing C file in src/test/, +or create a new C file there. Each test is a single function that must +be indexed in the table at the end of the file. We use the label "done:" as +a cleanup point for all test functions. + +(Make sure you read tinytest-manual.md before proceeding.) + +I use the term "unit test" and "regression tests" very sloppily here. + +=== A simple example + +Here's an example of a test function for a simple function in util.c: + + static void + test_util_writepid(void *arg) + { + (void) arg; + + char *contents = NULL; + const char *fname = get_fname("tmp_pid"); + unsigned long pid; + char c; + + write_pidfile(fname); + + contents = read_file_to_str(fname, 0, NULL); + tt_assert(contents); + + int n = sscanf(contents, "%lu\n%c", &pid, &c); + tt_int_op(n, OP_EQ, 1); + tt_int_op(pid, OP_EQ, getpid()); + + done: + tor_free(contents); + } + +This should look pretty familier to you if you've read the tinytest +manual. One thing to note here is that we use the testing-specific +function "get_fname" to generate a file with respect to a temporary +directory that the tests use. You don't need to delete the file; +it will get removed when the tests are done. + +Also note our use of OP_EQ instead of == in the tt_int_op() calls. +We define OP_* macros to use instead of the binary comparison +operators so that analysis tools can more easily parse our code. +(Coccinelle really hates to see == used as a macro argument.) + +Finally, remember that by convention, all *_free() functions that +Tor defines are defined to accept NULL harmlessly. Thus, you don't +need to say "if (contents)" in the cleanup block. + +=== Exposing static functions for testing + +Sometimes you need to test a function, but you don't want to expose +it outside its usual module. + +To support this, Tor's build system compiles a testing version of +teach module, with extra identifiers exposed. If you want to +declare a function as static but available for testing, use the +macro "STATIC" instead of "static." Then, make sure there's a +macro-protected declaration of the function in the module's header. + +For example, crypto_curve25519.h contains: + +#ifdef CRYPTO_CURVE25519_PRIVATE +STATIC int curve25519_impl(uint8_t *output, const uint8_t *secret, + const uint8_t *basepoint); +#endif + +The crypto_curve25519.c file and the test_crypto.c file both define +CRYPTO_CURVE25519_PRIVATE, so they can see this declaration. + +=== Mock functions for testing in isolation + +Often we want to test that a function works right, but the function depends +on other functions whose behavior is hard to observe, or whose + +XXXX WRITEME + +=== Advanced techniques: Namespaces + + +XXXX write this. danah boyd made us some really awesome stuff here. + + +Integration tests: Calling Tor from the outside +----------------------------------------------- + +XXXX WRITEME + +Writing integration tests with Stem +----------------------------------- + +XXXX WRITEME + +System testing with Chutney +--------------------------- + +XXXX WRITEME + +Who knows what evil lurks in the timings of networks? The Shadow knows! +----------------------------------------------------------------------- + +XXXX WRITEME + diff --git a/src/common/tortls.c b/src/common/tortls.c index ca62913..43fa7f8 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -2068,8 +2068,8 @@ tor_tls_free(tor_tls_t *tls) * number of characters read. On failure, returns TOR_TLS_ERROR, * TOR_TLS_CLOSE, TOR_TLS_WANTREAD, or TOR_TLS_WANTWRITE. */ -int -tor_tls_read(tor_tls_t *tls, char *cp, size_t len) +MOCK_IMPL(int, +tor_tls_read,(tor_tls_t *tls, char *cp, size_t len)) { int r, err; tor_assert(tls); diff --git a/src/common/tortls.h b/src/common/tortls.h index f8c6d59..2aac8af 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -77,7 +77,7 @@ int tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_t **identity); int tor_tls_check_lifetime(int severity, tor_tls_t *tls, int past_tolerance, int future_tolerance); -int tor_tls_read(tor_tls_t *tls, char *cp, size_t len); +MOCK_DECL(int, tor_tls_read, (tor_tls_t *tls, char *cp, size_t len)); int tor_tls_write(tor_tls_t *tls, const char *cp, size_t n); int tor_tls_handshake(tor_tls_t *tls); int tor_tls_finish_handshake(tor_tls_t *tls); diff --git a/src/common/util.c b/src/common/util.c index f7baab0..037acad 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3538,7 +3538,7 @@ finish_daemon(const char *cp) /** Write the current process ID, followed by NL, into <b>filename</b>. */ void -write_pidfile(char *filename) +write_pidfile(const char *filename) { FILE *pidfile; diff --git a/src/common/util.h b/src/common/util.h index 1b8fc74..bac4097 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -410,7 +410,7 @@ int path_is_relative(const char *filename); /* Process helpers */ void start_daemon(void); void finish_daemon(const char *desired_cwd); -void write_pidfile(char *filename); +void write_pidfile(const char *filename); /* Port forwarding */ void tor_check_port_forwarding(const char *filename, diff --git a/src/or/buffers.c b/src/or/buffers.c index ca0e815..6d13338 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -842,7 +842,7 @@ read_to_buf_tls(tor_tls_t *tls, size_t at_most, buf_t *buf) if (r < 0) return r; /* Error */ tor_assert(total_read+r < INT_MAX); - total_read += r; + total_read += r; if ((size_t)r < readlen) /* eof, block, or no more to read. */ break; } diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c index 101f448..8ca8be5 100644 --- a/src/test/test_buffers.c +++ b/src/test/test_buffers.c @@ -714,6 +714,59 @@ test_buffers_zlib_fin_at_chunk_end(void *arg) tor_free(msg); } +const uint8_t *tls_read_ptr; +int n_remaining; +int next_reply_val[16]; + +static int +mock_tls_read(tor_tls_t *tls, char *cp, size_t len) +{ + (void)tls; + int rv = next_reply_val[0]; + if (rv > 0) { + int max = rv > (int)len ? (int)len : rv; + if (max > n_remaining) + max = n_remaining; + memcpy(cp, tls_read_ptr, max); + rv = max; + n_remaining -= max; + tls_read_ptr += max; + } + + memmove(next_reply_val, next_reply_val + 1, 15*sizeof(int)); + return rv; +} + +static void +test_buffers_tls_read_mocked(void *arg) +{ + uint8_t *mem; + buf_t *buf; + (void)arg; + + mem = tor_malloc(64*1024); + crypto_rand((char*)mem, 64*1024); + tls_read_ptr = mem; + n_remaining = 64*1024; + + MOCK(tor_tls_read, mock_tls_read); + + buf = buf_new(); + + next_reply_val[0] = 1024; + tt_int_op(128, ==, read_to_buf_tls(NULL, 128, buf)); + + next_reply_val[0] = 5000; + next_reply_val[1] = 5000; + tt_int_op(6000, ==, read_to_buf_tls(NULL, 6000, buf)); + + + done: + UNMOCK(tor_tls_read); + tor_free(mem); + buf_free(buf); +} + struct testcase_t buffer_tests[] = { { "basic", test_buffers_basic, TT_FORK, NULL, NULL }, { "copy", test_buffer_copy, TT_FORK, NULL, NULL }, @@ -726,6 +779,8 @@ struct testcase_t buffer_tests[] = { { "zlib_fin_with_nil", test_buffers_zlib_fin_with_nil, TT_FORK, NULL, NULL }, { "zlib_fin_at_chunk_end", test_buffers_zlib_fin_at_chunk_end, TT_FORK, NULL, NULL}, + { "tls_read_mocked", test_buffers_tls_read_mocked, 0, + NULL, NULL }, END_OF_TESTCASES }; diff --git a/src/test/test_util.c b/src/test/test_util.c index 15470e8..3bebe60 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -4905,6 +4905,35 @@ test_util_ipv4_validation(void *arg) return; } +static void +test_util_writepid(void *arg) +{ + (void) arg; + + char *contents = NULL; + const char *fname = get_fname("tmp_pid"); + unsigned long pid; + char c; + + write_pidfile(fname); + + contents = read_file_to_str(fname, 0, NULL); + tt_assert(contents); + + int n = sscanf(contents, "%lu\n%c", &pid, &c); + tt_int_op(n, OP_EQ, 1); + tt_uint_op(pid, OP_EQ, +#ifdef _WIN32 + _getpid() +#else + getpid() +#endif + ); + + done: + tor_free(contents); +} + struct testcase_t util_tests[] = { UTIL_LEGACY(time), UTIL_TEST(parse_http_time, 0), @@ -4981,6 +5010,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(max_mem, 0), UTIL_TEST(hostname_validation, 0), UTIL_TEST(ipv4_validation, 0), + UTIL_TEST(writepid, 0), END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'writing_tests'
by nickm＠torproject.org 07 May '15

07 May '15

commit e086db795238da9187aa9824fda3d708cff10bf6 Merge: a2a6a19 79e8531 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 7 15:29:56 2015 -0400 Merge branch 'writing_tests' doc/WritingTests.txt | 167 +++++++++++++++++++++++++++++++++++++++++++++++ src/common/tortls.c | 4 +- src/common/tortls.h | 2 +- src/common/util.c | 2 +- src/common/util.h | 2 +- src/or/buffers.c | 2 +- src/test/test_buffers.c | 55 ++++++++++++++++ src/test/test_util.c | 30 +++++++++ 8 files changed, 258 insertions(+), 6 deletions(-)

1 0

[torbutton/master] Bug 15837: Show descriptions if unchecking custom mode
by gk＠torproject.org 07 May '15

07 May '15

commit d1ed854445b313c8539351820785981cda2bd37d Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 7 11:09:51 2015 +0000 Bug 15837: Show descriptions if unchecking custom mode --- src/chrome/content/preferences.xul | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index d25fba4..dfc0f2e 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -297,8 +297,12 @@ </vbox> </hbox> <hbox> +  <checkbox id="torbutton_sec_custom" flex="1" - label="&torbutton.prefs.sec_custom;"/> + oncommand="torbutton_set_slider_text(document, event.target.checked);" + label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox> </vbox>

1 0

[flashproxy/master] Make the badge XCF nicer.
by dcf＠torproject.org 07 May '15

07 May '15

commit ba0a517d25bd94bfba5424a4b3309801e5dfd5ff Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 7 09:03:34 2015 -0700 Make the badge XCF nicer. Threshold-alpha the text layers (some pixels were semi-transparent). Move the border to its own layer. --- proxy/badge-export-lang.scm | 4 +++- proxy/badge.xcf | Bin 3690 -> 3657 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/proxy/badge-export-lang.scm b/proxy/badge-export-lang.scm index 51f78f1..1e91967 100644 --- a/proxy/badge-export-lang.scm +++ b/proxy/badge-export-lang.scm @@ -6,13 +6,15 @@ (define (export lang) (let* ((image (car (gimp-file-load RUN-NONINTERACTIVE xcf-filename xcf-filename))) (shine-layer (car (gimp-image-get-layer-by-name image "shine"))) + (border-layer (car (gimp-image-get-layer-by-name image "border"))) (text-layer (car (gimp-image-get-layer-by-name image (string-append "text-" lang)))) (output-filename (string-append "badge-" lang ".png"))) ; Turn off all layers. (for-each (lambda (x) (gimp-item-set-visible x FALSE)) (vector->list (cadr (gimp-image-get-layers image)))) - ; Except the shine and the wanted text. + ; Except the shine, border, and the wanted text. (gimp-item-set-visible shine-layer TRUE) + (gimp-item-set-visible border-layer TRUE) (gimp-item-set-visible text-layer TRUE) (gimp-image-merge-visible-layers image CLIP-TO-IMAGE) (file-png-save RUN-NONINTERACTIVE image diff --git a/proxy/badge.xcf b/proxy/badge.xcf index cc3af06..c3482ed 100644 Binary files a/proxy/badge.xcf and b/proxy/badge.xcf differ

1 0

[flashproxy/master] Regen badge graphics.
by dcf＠torproject.org 07 May '15

07 May '15

commit e73702e769db1ab1e02f7e2ab152cebde6e9b2b7 Author: David Fifield <david(a)bamsoftware.com> Date: Thu May 7 09:06:38 2015 -0700 Regen badge graphics. --- proxy/badge-de.png | Bin 282 -> 255 bytes proxy/badge-pt.png | Bin 356 -> 241 bytes proxy/badge-ru.png | Bin 387 -> 264 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/proxy/badge-de.png b/proxy/badge-de.png index f00fec6..95d7e3b 100644 Binary files a/proxy/badge-de.png and b/proxy/badge-de.png differ diff --git a/proxy/badge-pt.png b/proxy/badge-pt.png index 84dc454..5193455 100644 Binary files a/proxy/badge-pt.png and b/proxy/badge-pt.png differ diff --git a/proxy/badge-ru.png b/proxy/badge-ru.png index 9bfc626..51fdd53 100644 Binary files a/proxy/badge-ru.png and b/proxy/badge-ru.png differ

1 0

[stem/master] Add bitcoin to list of recognized ports
by atagar＠torproject.org 07 May '15

07 May '15

commit 48d85d479e5713deace78a64125aaaad911eaff6 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 7 07:59:04 2015 -0700 Add bitcoin to list of recognized ports Patch from Toralf Förster so our port_usage() function recognizes bitcoin. --- stem/util/ports.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/stem/util/ports.cfg b/stem/util/ports.cfg index 2b0527f..8b7829e 100644 --- a/stem/util/ports.cfg +++ b/stem/util/ports.cfg @@ -296,6 +296,7 @@ port 8087 => SPP port 8088 => Radan HTTP port 8118 => Privoxy port 8123 => Polipo +port 8332-8333 => Bitcoin port 8443 => PCsync HTTPS port 8888 => NewsEDGE port 9030 => Tor

1 0

[torspec/master] Add control spec entry for HSPOST, and update HS_DESC events. (#3523)
by nickm＠torproject.org 07 May '15

07 May '15

commit ba30c1df4a11248c0a6c9b458530a7985ae41fac Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Sun Mar 22 18:49:38 2015 +0000 Add control spec entry for HSPOST, and update HS_DESC events. (#3523) --- control-spec.txt | 47 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 276490a..8a55e94 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1400,6 +1400,36 @@ [DEL_ONION was added in Tor 0.2.7.1-alpha.] +3.29. HSPOST + + The syntax is: + "+HSPOST" *[SP "SERVER=" Server] CRLF Descriptor CRLF "." CRLF + + Server = LongName + Descriptor = The text of the descriptor formatted as specified + in rend-spec.txt section 1.3. + + This command launches a hidden service descriptor upload to the specified + HSDirs. If one or more Server arguments are provided, an upload is triggered + on each of them in parallel. If no Server options are provided, it behaves + like a normal HS descriptor upload and will upload to the set of responsible + HS directories. + + If any value is unrecognized, a 552 error is returned and the command is + stopped. If there is an error in parsing the descriptor, the server + must send a "554 Invalid descriptor" reply. + + On success, Tor replies "250 OK" then Tor MUST eventually follow + this with a HS_DESC event with the result for each upload location. + + Examples are: + C: +HSPOST SERVER=9695DFC35FFEB861329B9F1AB04C46397020CE31 + [DESCRIPTOR] + . + S: 250 OK + + [HSPOST was added in Tor 0.2.7.1-alpha] + 4. Replies Reply codes follow the same 3-character format as used by SMTP, with the @@ -2690,18 +2720,20 @@ The syntax is: - "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir [SP DescriptorID] - [SP "REASON=" Reason] + "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir + [SP DescriptorID] [SP "REASON=" Reason] - Action = "REQUESTED" / "RECEIVED" / "IGNORE" / "FAILED" - HSAddress = 16*Base32Character / "UNKNOWN" + Action = "REQUESTED" / "UPLOAD" / "RECEIVED" / "UPLOADED" / "IGNORE" / + "FAILED" + HSAddress = 16*Base32Character AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN" HsDir = LongName / Fingerprint DescriptorID = 32*Base32Character - Reason = "BAD_DESC" / "QUERY_REJECTED" / "NOT_FOUND" / "UNEXPECTED" + Reason = "BAD_DESC" / "QUERY_REJECTED" / "UPLOAD_REJECTED" / "NOT_FOUND" / + "UNEXPECTED" These events will be triggerred when required HiddenService descriptor is - not found in the cache and a fetch from network is performed. + not found in the cache and a fetch or upload with the network is performed. If the fetch was triggered with only a DescriptorID (using the HSFETCH command for instance), the HSAddress only appears in the Action=RECEIVED @@ -2714,10 +2746,11 @@ For HsDir, LongName is always prefered. If HsDir cannot be found in node list at the time event is sent, Fingerprint will be used instead. - If Action is "FAILED", Tor SHOULD send Reason field as well. Possible + If Action is "FAILED", Tor SHOULD send Reason field as well. Possible values of Reason are: - "BAD_DESC" - descriptor was retrieved, but found to be unparsable. - "QUERY_REJECTED" - query was rejected by HS directory. + - "UPLOAD_REJECTED" - descriptor was rejected by HS directory. - "NOT_FOUND" - HS descriptor with given identifier was not found. - "UNEXPECTED" - nature of failure is unknown.

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit 3b7305457124de7d7fee52d3bd3e3fa1ca5f62e5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 4 18:30:06 2015 +0200 fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain. Fix reorder build error: ../../../dist/include/mozilla/net/HttpBaseChannel.h:339:11: error: 'mozilla::net::HttpBaseChannel::mRedirectCount' will be initialized after [-Werror=reorder] ../../../dist/include/mozilla/net/HttpBaseChannel.h:327:20: error: 'nsCOMPtr<nsIURI> mozilla::net::HttpBaseChannel::mProxyURI' [-Werror=reorder] /builds/slave/try-l64-d-00000000000000000000/build/src/netwerk/protocol/http/HttpBaseChannel.cpp:39:1: error: when initialized here [-Werror=reorder] --- netwerk/protocol/http/HttpBaseChannel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 64b202a..17f8c72 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -65,10 +65,10 @@ HttpBaseChannel::HttpBaseChannel() , mAllRedirectsSameOrigin(true) , mSuspendCount(0) , mProxyResolveFlags(0) + , mProxyURI(nullptr) , mContentDispositionHint(UINT32_MAX) , mHttpHandler(gHttpHandler) , mRedirectCount(0) - , mProxyURI(nullptr) { LOG(("Creating HttpBaseChannel @%x\n", this));

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit f259a80f3ee5a51e9826cdd1979d19a1f3943897 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 4 16:55:15 2015 +0200 fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. Remove unused variables proxyHost and proxyPort to fix unused-but-set-variable build errors. --- netwerk/base/src/nsSocketTransport2.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp index baa14da..658f2e0 100644 --- a/netwerk/base/src/nsSocketTransport2.cpp +++ b/netwerk/base/src/nsSocketTransport2.cpp @@ -1080,8 +1080,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us const char *host = mHost.get(); int32_t port = (int32_t) mPort; - const char *proxyHost = mProxyHost.IsEmpty() ? nullptr : mProxyHost.get(); - int32_t proxyPort = (int32_t) mProxyPort; uint32_t proxyFlags = 0; nsCOMPtr<nsIProxyInfo> proxyInfo = mProxyInfo; @@ -1154,8 +1152,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us // since socks is transparent, any layers above // it do not have to worry about proxy stuff proxyInfo = nullptr; - proxyHost = nullptr; - proxyPort = -1; proxyTransparent = true; } }

1 0