Permalink
Commits on Jun 26, 2015
  1. @jasnell

    doc: add CleartextStream deprecation notice

    Per: #8017
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25565
    jasnell committed Jun 24, 2015
  2. @jasnell

    doc: mention that mode is ignored if file exists

    per: #6847
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25565
    jasnell committed Jun 24, 2015
  3. @jasnell

    doc: improve http.abort description

    Per #4409, the documentation on http.abort is a bit lacking.
    This provides a slight improvement.
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25565
    jasnell committed Jun 24, 2015
Commits on Jun 22, 2015
  1. @misterdjules

    Merge remote-tracking branch 'upstream/v0.12'

    Conflicts:
    	src/node_version.h
    misterdjules committed Jun 22, 2015
  2. @misterdjules

    Now working on 0.12.6

    misterdjules committed Jun 22, 2015
  3. @misterdjules
  4. @misterdjules

    2015.06.22, Version 0.12.5 (Stable)

    * openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
    
    * npm: upgrade to 2.11.2
    
    * uv: upgrade to 1.6.1
    
    * V8: avoid deadlock when profiling is active (Dmitri Melikyan)
    
    * install: fix source path for openssl headers (Oguz Bastemur)
    
    * install: make sure opensslconf.h is overwritten (Oguz Bastemur)
    
    * timers: fix timeout when added in timer's callback (Julien Gilli)
    
    * windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
    misterdjules committed Jun 22, 2015
  5. @misterdjules

    Merge remote-tracking branch 'upstream/v0.10' into v0.12

    Conflicts:
    	AUTHORS
    	ChangeLog
    	lib/timers.js
    	src/node_version.h
    	test/common.js
    misterdjules committed Jun 22, 2015
  6. @misterdjules

    Now working on 0.10.40

    misterdjules committed Jun 22, 2015
  7. @misterdjules
Commits on Jun 19, 2015
  1. @misterdjules

    2015.06.18, Version 0.10.39 (Maintenance)

    * openssl: upgrade to 1.0.1o (Addressing multiple CVEs)
    
    * install: fix source path for openssl headers (Oguz Bastemur)
    
    * install: make sure opensslconf.h is overwritten (Oguz Bastemur)
    
    * timers: fix timeout when added in timer's callback (Julien Gilli)
    
    * windows: broadcast WM_SETTINGCHANGE after install (Mathias Küsel)
    misterdjules committed Jun 19, 2015
  2. @misterdjules

    tls: revert disable RC4 and cipher lists changes

    This reverts commit 67d9a56.
    
    This commit actually reverts both
    67d9a56 and
    02a549e (both related to ciphers list
    changes). It does it in one commit because reverting
    02a549e results in an empty commit.
    
    These changes are not yet ready to be released, and before they are we
    want to be able to publish new releases. We're reverting them so that we
    can submit a new PR that will contain all these changes plus what's
    necessary to be able to land them properly.
    
    Conflicts:
    	src/node.cc
    
    PR: #25511
    PR-URL: #25511
    Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
    misterdjules committed Jun 11, 2015
Commits on Jun 18, 2015
  1. @iarna @misterdjules

    deps: upgrade to npm 2.11.2

    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #25517
    iarna committed with misterdjules Jun 12, 2015
Commits on Jun 17, 2015
  1. @shigeki @mhdawson

    test: remove 512 bits test in test-tls-dhe.js

    Test of 512 bits key is failed after upgrading openssl-1.0.1o due to
    its limit of 768 bits key size. Remove it and start from 1024 bits
    test.
    
    Reviewed-By: Michael Dawson <mdawson@devrus.com>
    PR-URL: #25533
    shigeki committed with mhdawson Jun 17, 2015
  2. @shigeki @misterdjules

    openssl: fix keypress requirement in apps on win32

    reapply b910613
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    
    PR: #25523
    PR-URL: #25523
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    shigeki committed with misterdjules Feb 17, 2015
  3. @indutny @misterdjules

    deps: fix openssl assembly error on ia32 win32

    `x86masm.pl` was mistakenly using .486 instruction set, why `cpuid` (and
    perhaps others) are requiring .686 .
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    
    PR: #25523
    PR-URL: #25523
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    indutny committed with misterdjules Jan 8, 2014
  4. @shigeki @misterdjules

    deps: separate sha256/sha512-x86_64.pl for openssl

    sha256-x86_64.pl does not exist in the origin openssl distribution. It
    was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
    modified so as to generates only one asm file specified as its key
    hash length.
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    
    PR: #25523
    PR-URL: #25523
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    shigeki committed with misterdjules Mar 18, 2015
  5. @shigeki @misterdjules

    deps: replace all headers in openssl

    Change all openssl/include/openssl/*.h to include resolved symbolic
    links and openssl/crypto/opensslconf.h to refer config/opensslconf.h.
    
    PR: #25523
    PR-URL: #25523
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    shigeki committed with misterdjules Jun 12, 2015
  6. @shigeki @misterdjules

    deps: upgrade to openssl-1.0.1o

    This just replaces all sources of openssl-1.0.1o.tar.gz into
    deps/openssl/openssl.
    
    PR: #25523
    PR-URL: #25523
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    shigeki committed with misterdjules Jun 12, 2015
  7. @misterdjules

    timers: fix timeout when added in timer's callback

    When a timer is added in another timer's callback, its underlying timer
    handle will be started with a timeout that is actually incorrect.
    
    The reason is that  the value that represents the current time is not
    updated between the time the original callback is called and the time
    the added timer is processed by timers.listOnTimeout. That leads the
    logic in timers.listOnTimeout to do an incorrect computation that makes
    the added timer fire with a timeout of scheduledTimeout +
    timeSpentInCallback.
    
    This change fixes that and make timers scheduled within other timers'
    callbacks fire as expected.
    
    Fixes #9333 and #15447.
    
    PR: #17203
    PR-URL: #17203
    Reviewed-By: Fedor Indutny <fedor@indutny.com>
    misterdjules committed Apr 21, 2015
Commits on Jun 16, 2015
  1. @trevnorris @misterdjules

    build: fix use of strict aliasing

    The -fno-strict-aliasing flag was added to fix compilation warnings when
    building Node.js with GCC <= 4.4
    
    PR: #25141
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #25475
    trevnorris committed with misterdjules Feb 10, 2015
  2. @saghul @misterdjules

    deps: update libuv to version 1.6.1

    Fixes: #9310
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #25475
    saghul committed with misterdjules Jun 4, 2015
Commits on Jun 11, 2015
  1. @zkat @misterdjules

    deps: upgrade to npm 2.11.1

    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #25482
    zkat committed with misterdjules Jun 5, 2015
Commits on Jun 10, 2015
  1. @dmelikyan @misterdjules

    V8: avoid deadlock when profiling is active

    A deadlock happens when sampler initiated by SIGPROF tries to lock
    the thread and the thread is already locked by the same thread. As
    a result, other thread involved in sampling process hangs. The
    patch adds a check for thread lock before continuing sampler
    operation.
    
    The fix has been tested on a sample app under load with and without
    profiling turned on.
    
    Fixes issue #14576 and specifically the duplicate issue #25295
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #25309
    dmelikyan committed with misterdjules May 14, 2015
Commits on Jun 5, 2015
  1. @chrisneave @jasnell

    docs: Fix grammar in Transform API text

    The third sentence of the fifth paragraph of the documentation for
    transform._transform() has several words omitted and makes no
    sense. This fix fills in the missing words to clarify the passage.
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25371
    chrisneave committed with jasnell May 23, 2015
  2. @duzun @jasnell

    fixed a typo: fs.ReadStream(filename) -> fs.createReadStream(filename)

    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25453
    duzun committed with jasnell May 28, 2015
  3. @hidekiy @jasnell

    Fix improper sample code in http.markdown

    You must consume the data from the response object. #8443
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25471
    hidekiy committed with jasnell Jun 2, 2015
Commits on Jun 4, 2015
  1. @misterdjules

    Merge remote-tracking branch 'upstream/v0.12'

    Conflicts:
    	doc/api/tls.markdown
    	src/node_version.h
    misterdjules committed Jun 4, 2015
  2. @socketpair @jasnell

    tls.createSecurePair(): fix documentation typo

    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25341
    socketpair committed with jasnell May 16, 2015
  3. @shigeki @orangemocha

    test: add -no_rand_screen for tls-server-verify

    This improves the performance of openssl s_client on Windows and
    gains several seconds to finish test-tls-server-verify.
    
    (cherry picked from commit 2ff517e)
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25368
    shigeki committed with orangemocha May 27, 2015
  4. @shigeki @orangemocha

    deps: add -no_rand_screen to openssl s_client

    In openssl s_client on Windows, RAND_screen() is invoked to initialize
    random state but it takes several seconds in each connection.
    This added -no_rand_screen to openssl s_client on Windows to skip
    RAND_screen() and gets a better performance in the unit test of
    test-tls-server-verify.
    Do not enable this except to use in the unit test.
    
    (cherry picked from commit 9f0f7c3)
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25368
    shigeki committed with orangemocha May 27, 2015
  5. @shigeki @orangemocha

    test: kill child in tls-server-verify for speed up

    For better performance of the test, the parent kills child processes
    so as not to wait them to be ended.
    
    (cherry picked from commit 833b236)
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25368
    shigeki committed with orangemocha May 27, 2015
  6. @orangemocha

    test,win: re-enable tls-server-verify in CI

    Now that the test is fixed, node-accept-pull-request should
    fail when the test fails.
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25368
    orangemocha committed May 22, 2015
  7. @joaocgreis @orangemocha

    test: improve console output of tls-server-verify

    When running in parallel, it is not easy to identify what server and
    client failed when the test fails. This adds identifiers to all lines
    of console output.
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25368
    joaocgreis committed with orangemocha May 22, 2015
  8. @joaocgreis @orangemocha

    test: run tls-server-verify servers in parallel

    Different servers must use different ports. Since we can count only on
    common.PORT and common.PORT+1, run only 2 servers in parallel.
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #25368
    joaocgreis committed with orangemocha May 22, 2015