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: 6aea173e934f
Choose a base ref
...
head repository: nodejs/node-v0.x-archive
compare: 96608335862d
Choose a head ref
  • 16 commits
  • 114 files changed
  • 5 contributors

Commits on Jun 29, 2015

  1. src: fix signed/unsigned comparison warning 

    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: #25588
    @bnoordhuis
    bnoordhuis authored and Colin Ihrig committed Jun 29, 2015
    Copy the full SHA
    5fc4fb1 View commit details
    Browse the repository at this point in the history

  2. v8: back-port JitCodeEvent patch from upstream 

    Original commit log follows:

    Meaningful name for builtins in JitCodeEvent API.

    Report builtins by name (e.g. "Builtin:ArgumentsAdaptorTrampoline")
    instead of labeling everything "Builtin:A builtin from the snapshot"

    Review URL: https://codereview.chromium.org/1216833002

Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
PR-URL: #25588
    @bnoordhuis
    bnoordhuis authored and Colin Ihrig committed Jun 29, 2015
    Copy the full SHA
    5a60e0d View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2015

  1. win,msi: create npm folder in AppData directory 

    Create the empty npm folder in Roaming\Appdata so that non-Administrator
users have a place to store global packages. This fixes the error Error:
ENOENT, stat error that occurs when a user tries to run the npm install
<package> command.

Bug: #8141
PR: #8838
Reviewed-by: Bert Belder <bertbelder@gmail.com>
    @piscisaureus
    Steven Rockarts authored and piscisaureus committed Jul 1, 2015
    Copy the full SHA
    18d413d View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2015

  1. deps: upgrade openssl sources to 1.0.1p 

    This just replaces all sources of openssl-1.0.1p.tar.gz
into deps/openssl/openssl.

PR: #25654
PR-URL: #25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    Shigeki Ohtsu authored and Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    0cf9f27 View commit details
    Browse the repository at this point in the history

  2. deps: copy all openssl header files to include dir 

    All symlink files in `deps/openssl/openssl/include/openssl/`
 are removed and replaced with real header files to avoid
issues on Windows.

PR: #25654
PR-URL: #25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    Shigeki Ohtsu authored and Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    8277822 View commit details
    Browse the repository at this point in the history

  3. 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>

PR: #25654
PR-URL: #25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    Shigeki Ohtsu authored and Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    984e7f9 View commit details
    Browse the repository at this point in the history

  4. 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>

PR: #25654
PR-URL: #25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    @indutny
    indutny authored and Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    7ad5938 View commit details
    Browse the repository at this point in the history

  5. 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>

PR: #25654
PR-URL: #25654
Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
    Shigeki Ohtsu authored and Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    c5d7b31 View commit details
    Browse the repository at this point in the history

  6. 2015.07.09, Version 0.10.40 (Maintenance) 

    * openssl: upgrade to 1.0.1p

* V8: back-port JitCodeEvent patch from upstream (Ben Noordhuis)

* win,msi: create npm folder in AppData directory (Steven Rockarts)
    Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    0439a28 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'v0.10.40-release' into v0.10

    Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    26bb1ad View commit details
    Browse the repository at this point in the history

  8. Now working on 0.10.41

    Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    e5aaa34 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	AUTHORS
	ChangeLog
	deps/v8/src/log.cc
	src/node_version.h
    Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    9c5e9fc View commit details
    Browse the repository at this point in the history

  10. 2015.07.09, Version 0.12.7 (Stable) 

    * openssl: upgrade to 1.0.1p (CVE-2015-1793)

* npm: upgrade to 2.11.3

* V8: cherry-pick JitCodeEvent patch from upstream (Ben Noordhuis)

* win,msi: create npm folder in AppData directory (Steven Rockarts)
    Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    d3492aa View commit details
    Browse the repository at this point in the history

  11. Merge branch 'v0.12.7-release' into v0.12

    Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    bd68784 View commit details
    Browse the repository at this point in the history

  12. Now working on 0.12.8

    Julien Gilli committed Jul 9, 2015
    Copy the full SHA
    b8ac658 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2015

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

    Conflicts:
	src/node_version.h
    Julien Gilli committed Jul 10, 2015
    Copy the full SHA
    9660833 View commit details
    Browse the repository at this point in the history