Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Mar 24, 2015
  1. @misterdjules

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

    misterdjules authored
    Conflicts:
    	src/node_version.h
  2. @misterdjules

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

    misterdjules authored
    Conflicts:
    	ChangeLog
    	src/node_version.h
  3. @misterdjules

    Now working on 0.12.2

    misterdjules authored
  4. @misterdjules

    Merge branch 'v0.12.1-release' into v0.12

    misterdjules authored
    Conflicts:
    	ChangeLog
  5. @misterdjules

    2015.03.23, Version 0.12.1 (Stable)

    misterdjules authored
    * openssl: upgrade to 1.0.1m (Addressing multiple CVES)
  6. @shigeki @misterdjules

    openssl: fix keypress requirement in apps on win32

    shigeki authored misterdjules committed
    reapply b910613792dac946b295855963869933a9089044
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  7. @shigeki @misterdjules

    deps: remove unused backup file in openssl asm

    shigeki authored misterdjules committed
    deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally
    committed before.
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  8. @shigeki @misterdjules

    deps: remove vpaesni-x86_64.asm in x64-win32-masm

    shigeki authored misterdjules committed
    It is no longer used.
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  9. @indutny @misterdjules

    deps: fix openssl assembly error on ia32 win32

    indutny authored misterdjules committed
    `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>
  10. @shigeki @misterdjules

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

    shigeki authored misterdjules committed
    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>
  11. @shigeki @misterdjules

    deps: replace all headers in openssl

    shigeki authored misterdjules committed
    change all openssl/include/openssl/*.h to include resolved symbolic
    links and openssl/crypto/opensslconf.h to refer config/opensslconf.h
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  12. @jasnell @misterdjules

    deps: upgrade to openssl-1.0.1m

    jasnell authored misterdjules committed
    Extract the tarball into deps/openssl/openssl
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    
    Conflicts:
    	deps/openssl/openssl/apps/s_client.c
Commits on Mar 23, 2015
  1. @misterdjules

    Now working on 0.10.39

    misterdjules authored
  2. @misterdjules
  3. @saghul @mdawsonibm

    watchdog: fix timeout for early polling return

    saghul authored mdawsonibm committed
    Switch from running the loop with UV_RUN_ONCE to UV_RUN_DEFAULT, because
    it's possible that the poll returns earlier than expected and thus the
    timer is not run on a single interation.
    
    The loop is not stopped either from the timer callback or from the async
    handle's.
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9410
  4. @misterdjules

    2015.03.23, Version 0.10.38 (Maintenance)

    misterdjules authored
    * openssl: upgrade to 1.0.1m (Addressing multiple CVEs)
  5. @shigeki @misterdjules

    openssl: fix keypress requirement in apps on win32

    shigeki authored misterdjules committed
    reapply b910613792dac946b295855963869933a9089044
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  6. @shigeki @misterdjules

    deps: remove unused backup file in openssl asm

    shigeki authored misterdjules committed
    deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.orig was accidentally
    committed before.
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  7. @shigeki @misterdjules

    deps: remove vpaesni-x86_64.asm in x64-win32-masm

    shigeki authored misterdjules committed
    It is no longer used.
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  8. @indutny @misterdjules

    deps: fix openssl assembly error on ia32 win32

    indutny authored misterdjules committed
    `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>
  9. @shigeki @misterdjules

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

    shigeki authored misterdjules committed
    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>
  10. @shigeki @misterdjules

    deps: replace all headers in openssl

    shigeki authored misterdjules committed
    change all openssl/include/openssl/*.h to include resolved symbolic
    links and openssl/crypto/opensslconf.h to refer config/opensslconf.h
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  11. @jasnell @misterdjules

    deps: upgrade to openssl-1.0.1m

    jasnell authored misterdjules committed
    Extract the tarball into deps/openssl/openssl
    
    PR: #9451
    PR-URL: #9451
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
Commits on Mar 19, 2015
  1. @trevnorris

    deps: indicate uv has been patched

    trevnorris authored
    Because we are floating several patches on top of libuv, make that
    apparent in the version number.
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9179
  2. @oleavr @trevnorris

    uv: fix size calculation in select() fallback

    oleavr authored trevnorris committed
    Original commit message:
    
      darwin: fix size calculation in select() fallback
    
      Apple's `fd_set` stores its bits in an array of 32-bit integers, which
      means `FD_ISSET()` may read out of bounds if we allocate storage at
      byte granularity. There's also a chance that the `select()` call could
      corrupt the heap, although I didn't investigate that.
    
      This issue was discovered by LLVM's AddressSanitizer which caught
      `FD_ISSET()` trying to read out of bounds.
    
    Ref: libuv/libuv#241
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9179
  3. @misterdjules @trevnorris

    uv: fix setsockopt for multicast options

    misterdjules authored trevnorris committed
    Float patch to fix setsockopt for multicast on Solaris and derivatives.
    Original commit message:
    
      solaris: fix setsockopt for multicast options
    
      On Solaris and derivatives such as SmartOS, the length of socket options
      for multicast and ttl options is not always sizeof(char).
    
      This fixes the udp_options and udp_options6 tests.
    
    Ref: libuv/libuv#243
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9179
  4. @orangemocha @trevnorris

    uv: float win pipe patch

    orangemocha authored trevnorris committed
    Float patch to fix pipe on Windows. Original commit message:
    
      win: fix pipe blocking writes
    
      In the code path for pipe blocking writes, WriteFile is already
      posting a completion packet to the I/O completion port.
      POST_COMPLETION_FOR_REQ was causing the same request to get
      returned twice by GetCompletionStatusEx.
      Also on the same code path, we were waiting on the wrong event.
    
      We need to update queued_bytes and write_queue_size when a
      blocking write request completes asynchronously.
    
    Ref: libuv/libuv#238
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9179
  5. @bnoordhuis @trevnorris

    lib: fix stdio/ipc sync i/o regression

    bnoordhuis authored trevnorris committed
    process.send() should be synchronous, it should block until the message
    has been sent in full, but it wasn't after the second-to-last libuv
    upgrade because of commit libuv/libuv@393c1c5 ("unix: set non-block
    mode in uv_{pipe,tcp,udp}_open"), which made its way into io.js in
    commit 07bd05b ("deps: update libuv to 1.2.1").
    
    Commit libuv/libuv@b36d4ff ("unix: implement uv_stream_set_blocking()")
    as landed in io.js in commit 9681fca ("deps: update libuv to 1.4.0")
    makes it possible to restore the synchronous behavior again and that's
    precisely what this commit does.
    
    The same line of reasoning applies to `net.Socket({ fd: 1 })`: creating
    a socket object from a stdio file descriptor, like the `process.stdout`
    getter does, should put the file descriptor in blocking mode for
    compatibility reasons.
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9179
  6. @trevnorris

    build: fix use of strict aliasing

    trevnorris authored
    The -fno-strict-aliasing flag was added to fix compilation warnings when
    building Node.js with GCC <= 4.4
    
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9179
  7. @trevnorris

    deps: update libuv to 1.4.2

    trevnorris authored
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    PR-URL: #9179
Commits on Mar 17, 2015
  1. @amir-s @misterdjules

    url: resolve urls with . and ..

    amir-s authored misterdjules committed
    '.' and '..' are directory specs and resolving urls with or without the
    hostname with '.' and '..' should add a trailing slash to the end of the
    url.
    
    Fixes #8992.
    
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    PR-URL: #9427
Commits on Mar 16, 2015
  1. @misterdjules
  2. @misterdjules

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

    misterdjules authored
    Conflicts:
    	AUTHORS
    	ChangeLog
    	deps/uv/ChangeLog
    	deps/uv/build.mk
    	deps/uv/config-unix.mk
    	deps/uv/include/uv-private/uv-win.h
    	deps/uv/src/unix/async.c
    	deps/uv/src/unix/process.c
    	deps/uv/src/version.c
    	deps/uv/src/win/poll.c
    	deps/uv/test/test-list.h
    	deps/uv/uv.gyp
    	lib/http.js
    	src/node.js
    	src/node_version.h
  3. @stcruy @cjihrig

    doc: fix '\\' typos on Windows

    stcruy authored cjihrig committed
    This commit changes the Windows examples in path.markdown to
    correctly display '\\'.
    
    PR-URL: #9412
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  4. @fastest963 @cjihrig

    net: use cached peername to resolve remote fields

    fastest963 authored cjihrig committed
    Allows socket.remote* properties to still be accessed even after the
    socket is closed.
    
    Fixes: #9287
    PR-URL: #9366
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Something went wrong with that request. Please try again.