Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node-v0.x-archive
base: 20d8db1a42ef
Choose a base ref
...
head repository: nodejs/node-v0.x-archive
compare: f50c37d99316
Choose a head ref
  • 19 commits
  • 226 files changed
  • 9 contributors

Commits on Apr 8, 2015

  1. tls: disable RC4, add --cipher-list command line switch

    Disable RC4 in the default cipher list
    
    Add the `--cipher-list` command line switch and `NODE_CIPHER_LIST`
    environment variable to completely override the default cipher list.
    
    Add the `--enable-legacy-cipher-list` and `NODE_LEGACY_CIPHER_LIST`
    environment variable to selectively enable the default cipher list from
    previous node.js releases.
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #14413
    jasnell committed Apr 8, 2015
    Copy the full SHA
    67d9a56 View commit details
    Browse the repository at this point in the history
  2. tls: make the --enable-legacy-cipher-list help less verbose

    Per feedback on the commit, make the PrintHelp for
    --enable-legacy-cipher-list less verbose.
    
    Reviewed-By: James M Snell <jasnell@gmail.com>
    PR-URL: #14413
    jasnell committed Apr 8, 2015
    Copy the full SHA
    02a549e View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. doc: add link to workflow in api docs menu

    Added link to workflow guidelines page in API docs' navigation menu.
    
    Fixes nodejs/nodejs.org-archive#102.
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #14570
    paulomcnally authored and Julien Gilli committed Apr 10, 2015
    Copy the full SHA
    de90403 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2015

  1. docs: clarify usage of stream.Writable.write

    Add separate sample code for the write-after-end case to avoid
    confusion.
    
    PR: #15517
    PR-URL: #15517
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    AlexKVal authored and Julien Gilli committed Apr 15, 2015
    Copy the full SHA
    9800e0b View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2015

  1. install: fix source path for openssl headers

    PR: #14089
    PR-URL: #14089
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
    Reviewed-By: James M Snell <jasnell@gmail.com>
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    obastemur authored and Julien Gilli committed Apr 23, 2015
    Copy the full SHA
    9d19dfb View commit details
    Browse the repository at this point in the history
  2. install: make sure opensslconf.h is overwritten

    PR: #14089
    PR-URL: #14089
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
    Reviewed-By: James M Snell <jasnell@gmail.com>
    Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    obastemur authored and Julien Gilli committed Apr 23, 2015
    Copy the full SHA
    4028669 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2015

  1. win,msi: Added empty InstallExecuteSequence group

    This is needed so that we can backport
    668bde8 from io.js with
    a clean merge.
    
    PR-URL: #25100
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Fixes: #4356
    joaocgreis authored and orangemocha committed May 11, 2015
    Copy the full SHA
    ad9947e View commit details
    Browse the repository at this point in the history
  2. win,msi: broadcast WM_SETTINGCHANGE after install

    Backport 668bde8 from io.js.
    Original commit message follows:
    
    In theory the msi should broadcast a 'WM_SETTINGCHANGE' message to all
    windows after modifying the PATH environment variable. This ensures that
    the new PATH is visible to other processes without restarting windows
    (although it's still necessary to close and reopen active console
    windows).
    
    Unfortunately, the broadcast doesn't always happen, for unknown reasons.
    That's why this patch adds a custom action that unconditionally
    broadcasts a WM_SETTINGCHANGE message.
    
    Bug: nodejs/node#603
    PR: nodejs/node#613
    Reviewed-by: Bert Belder <bertbelder@gmail.com>
    (cherry picked from commit 668bde8)
    
    --Node.js commmit metadata--
    PR-URL: #25100
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Fixes: #4356
    mathiask88 authored and orangemocha committed May 11, 2015
    Copy the full SHA
    e7c84f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. 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>
    Julien Gilli committed Jun 17, 2015
    5
    Copy the full SHA
    d38e865 View commit details
    Browse the repository at this point in the history
  2. 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 Ohtsu authored and Julien Gilli committed Jun 17, 2015
    Copy the full SHA
    456c22f View commit details
    Browse the repository at this point in the history
  3. 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 Ohtsu authored and Julien Gilli committed Jun 17, 2015
    Copy the full SHA
    ee95454 View commit details
    Browse the repository at this point in the history
  4. 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 Ohtsu authored and Julien Gilli committed Jun 17, 2015
    Copy the full SHA
    3937563 View commit details
    Browse the repository at this point in the history
  5. 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 authored and Julien Gilli committed Jun 17, 2015
    Copy the full SHA
    81e30a1 View commit details
    Browse the repository at this point in the history
  6. 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 Ohtsu authored and Julien Gilli committed Jun 17, 2015
    Copy the full SHA
    9463cfa View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2015

  1. 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>
    Julien Gilli committed Jun 19, 2015
    Copy the full SHA
    dcb7ef2 View commit details
    Browse the repository at this point in the history
  2. 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)
    Julien Gilli committed Jun 19, 2015
    Copy the full SHA
    615a35c View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2015

  1. Merge branch 'v0.10.39-release' into v0.10

    Julien Gilli committed Jun 22, 2015
    Copy the full SHA
    3a1d4b7 View commit details
    Browse the repository at this point in the history
  2. Now working on 0.10.40

    Julien Gilli committed Jun 22, 2015
    Copy the full SHA
    6f8400a View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'upstream/v0.10' into v0.12

    Conflicts:
    	AUTHORS
    	ChangeLog
    	lib/timers.js
    	src/node_version.h
    	test/common.js
    Julien Gilli committed Jun 22, 2015
    Copy the full SHA
    f50c37d View commit details
    Browse the repository at this point in the history