Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: merge-review
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>
Commits on Mar 13, 2015
  1. @misterdjules

    make: remove node_dtrace from cpplint excludes

    misterdjules authored
    Reviewed-By: Fedor Indutny <fedor@indutny.com>
    PR-URL: #8741
  2. @orangemocha

    test: update flaky test definitions

    orangemocha authored
    test-fs-watch is flaky on OSX.
Commits on Mar 12, 2015
  1. @misterdjules

    Now working on 0.10.38

    misterdjules authored
  2. @misterdjules
Commits on Mar 11, 2015
  1. @misterdjules

    2015.03.11, Version 0.10.37 (Maintenance)

    misterdjules authored
    * uv: update to 0.10.36 (CVE-2015-0278)
    
    * domains: fix stack clearing after error handled (Jonas Dohse)
    
    * buffer: reword Buffer.concat error message (Chris Dickinson)
    
    * console: allow Object.prototype fields as labels (Julien Gilli)
    
    * V8: log version in profiler log file (Ben Noordhuis)
    
    * http: fix performance regression for GET requests (Florin-Cristian Gavrila)
  2. @misterdjules

    build: allow custom PackageMaker path

    misterdjules authored
    Make PACKAGEMAKER customizable because PackageMaker is not necessarily
    installed in /Developer on OSX anymore.
    
    PR: #9377
    PR-URL: #9377
    Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
  3. @indutny

    buffer: align chunks on 8-byte boundary

    indutny authored
    When slicing global pool - ensure that the underlying buffer's data ptr
    is 8-byte alignment to do not ruin expectations of 3rd party C++ addons.
    
    NOTE: 0.10 node.js always returned aligned pointers and v0.12 should do
    this too for compatibility.
    
    PR-URL: #9375
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
  4. @dohse @misterdjules

    domains: fix stack clearing after error handled

    dohse authored misterdjules committed
    caeb677 introduced a regression where
    the domains stack would not be cleared after an error had been handled
    by the top-level domain.
    
    This change clears the domains stack regardless of the position of the
    active domain in the stack.
    
    PR: #9364
    PR-URL: #9364
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
Commits on Mar 10, 2015
  1. @tyleranton @misterdjules

    docs: add return value for sync fs functions

    tyleranton authored misterdjules committed
    Clarify that synchronous functions in fs with no return value return
    undefined.
    
    Specify that fs.openSync() returns an integer and fs.existsSync()
    returns true or false.
    
    Fixes #9313
    
    PR: #9359
    PR-URL: #9359
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
Commits on Mar 7, 2015
  1. @othiym23 @misterdjules

    deps: upgrade npm to 2.7.0

    othiym23 authored misterdjules committed
    PR: #9347
    PR-URL: #9347
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
Commits on Mar 6, 2015
  1. @misterdjules

    url: revert reslove urls with . and ..

    misterdjules authored
    This reverts commit ad06848.
    
    Initially, this bug fix targeted master, and I pushed to have it
    included in v0.10. In retrospect, I'm not sure it should have made into
    v0.10 as it seems it could break a lot of existing working code.
    
    In my opinion, this change is still a bug fix, and it is not backward
    incompatible per se. However, I'm not sure that taking the risk to break
    a lot of users with a new 0.10.x release that would include this fix is
    reasonable, especially now that 0.10.x releases are entering
    maintenance mode.
    
    PR-URL: #9257
    Reviewed-by: Trevor Norris <trev.norris@gmail.com>
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  2. @saghul @misterdjules

    deps: update libuv to 0.10.36

    saghul authored misterdjules committed
    PR: #9274
    PR-URL: #9274
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
Commits on Mar 5, 2015
  1. @CGavrila @misterdjules

    http: fix performance regression for GET requests

    CGavrila authored misterdjules committed
    A significant performance regressions has been introduced in 1fddc1f for
    GET requests which send data through response.end(). The number of
    requests per second dropped to somewhere around 6% of their previous
    level.
    
    The fix consists of removing a part of the lines added by 1fddc1f,
    lines which were supposed to affect only HEAD requests, but interfered
    with GET requests instead.
    
    The lines removed would not have affected the behaviour in the case of
    a HEAD request as this._hasBody would always be false. Therefore, they
    were not required to fix the issue reported in #8361.
    
    Fixes #8940.
    
    PR: #9026
    PR-URL: #9026
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  2. @cjihrig

    net: allow port 0 in connect()

    cjihrig authored
    The added validation allows non-negative numbers and numeric
    strings. All other values result in a thrown exception.
    
    Fixes: #9194
    PR-URL: #9268
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
    Reviewed-By: James M Snell <jasnell@users.noreply.github.com>
  3. @misterdjules
  4. @misterdjules

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

    misterdjules authored
    Conflicts:
    	lib/buffer.js
  5. @chrisdickinson @misterdjules

    buffer: reword Buffer.concat error message

    chrisdickinson authored misterdjules committed
    this brings the error messaging in line with
    other node TypeError messages.
    
    fixes joyent/node#7766.
    
    PR: #8723
    PR-URL: #8723
    Reviewed-By: James M Snell <jasnell@users.noreply.github.com>
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Commits on Mar 3, 2015
  1. @misterdjules

    src: enable strict mode in all builtin modules

    misterdjules authored
    This is a follow-up commit for b233131.
    
    It enables strict mode in all built-in modules.
    
    PR: #9302
    PR-URL: #9302
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
  2. @othiym23 @misterdjules

    deps: upgrade npm to 2.6.1

    othiym23 authored misterdjules committed
    PR: #9297
    PR-URL: #9297
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  3. @misterdjules

    tests: fix race in test-http-curl-chunk-problem

    misterdjules authored
    This test setups two event listeners: one on a child process' exit event
    , another for the same child process' stdandard output's 'data' event.
    The data even listener writes to a stream, and the exit event listener
    ends it.
    
    Because the exit event can be emitted before the data event, there is a
    chance that something will be written to the stream after it's ended,
    and that an error is thrown.
    
    This change makes the test end the stream in the listener for the child
    process' standard output's end event, which is guaranteed to be emitted
    after the last data event, thus avoiding the race.
    
    PR: #9301
    PR-URL: #9301
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
    Reviewed-By: James M Snell <jasnell@users.noreply.github.com>
    Reviewed-By: Bert Belder <bertbelder@gmail.com>
Commits on Feb 28, 2015
  1. @misterdjules
  2. @misterdjules

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

    misterdjules authored
    Conflicts:
    	lib/console.js
    	test/simple/test-console.js
  3. @misterdjules

    src: fix builtin modules failing with --use-strict

    misterdjules authored
    Currently, lib/_tls_legacy.js and lib/crypto.js cannot be loaded when
    --use-strict is passed to node. In addition to that, console.trace
    throws because it uses arguments.callee.
    
    This change fixes these issues and adds a test that makes sure
    every external built-in module can be loaded with require when
    --use-strict is enabled.
    
    Please note that this change does not fix all issues with built-in
    modules' code running with --use-strict. It is very likely that some
    code in the built-in modules still fails when passing this flag.
    
    However, fixing all code would require us to enable strict mode by
    default in all builtins modules, which would certainly break existing
    applications.
    
    Fixes #9187.
    
    PR: #9237
    PR-URL: #9237
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Commits on Feb 27, 2015
  1. @mhdawson @cjihrig

    test: make destroyed-socket-write2.js more robust

    mhdawson authored cjihrig committed
    test/simple/test-http-destroyed-socket-write2.js validates
    that you get an appropriate error when trying to write to
    a request when the response on the other side has been destroyed.
    
    The test uses http.request to get a request and then keeps writing
    to it until either it hits 128 writes or gets the expected error.
    Since the writes are asynchronous we see that the writes just end
    up adding events to the event loop, which then later get processed
    once the connection supporting the request is fully ready.
    
    The test is timing dependent and if takes too long for the connection
    to be made the limit of 128 writes is exceeded and the test fails.
    The fact that the test allows a number of writes is probably to allow
    some delay for the connection to be ready for writing.
    
    On AIX, in the default configuration using the loopback interface
    is slower and the test fails because the delay is such that many
    more writes can be queued up before the connection takes place.
    If we use the host ip instead of defaulting to the loopback then
    the test passes.
    
    The test needs to be made more robust to delays. Since each write
    simply enqueues an additional write to the event queue there is
    probably no point in doing the second write until the first has
    completed. This patch schedules the next write when the first one
    completes and allows the test to pass even if it takes longer for
    the connection to be ready for writing
    
    PR-URL: #9270
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
    Reviewed-By: Timothy J Fontaine <tjfontaine@gmail.com>
Commits on Feb 25, 2015
  1. @robertkowalski @misterdjules

    doc: add explanations for querystring

    robertkowalski authored misterdjules committed
     - add an article: `decode a non-utf8 string`
     - explain default and fallback behaviour of `querystring.unescape`
    
    PR-URL: #9259
    Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
  2. @h7lin @misterdjules

    doc: fix default value of opts.decodeURIComponent

    h7lin authored misterdjules committed
    In the documentation for querystring.parse, the documentation mentions
    that the default value for options.decodeURIComponent is the
    decodeURIComponent function, but it's actually the querystring.unescape
    function.
    
    PR-URL: #9259
    Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
Commits on Feb 24, 2015
  1. @robertkowalski @misterdjules

    doc: remove broken link to tracing api

    robertkowalski authored misterdjules committed
    closes joyent/node-website#77
    
    PR: #9172
    PR-URL: #9172
    Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
Commits on Feb 20, 2015
  1. @bsnote @trevnorris

    deps: backport a02d97e from v8 upstream

    bsnote authored trevnorris committed
    Original commit message:
    
      Fix --max_old_space_size=4096 integer overflow.
    
      BUG=v8:3857
      LOG=N
    
      Review URL: https://codereview.chromium.org/897543002
    
      Cr-Commit-Position: refs/heads/master@{#26510}
    
    PR-URL: #9200
    Reviewed-by: Trevor Norris <trev.norris@gmail.com>
    Reviewed-by: Julien Gilli <julien.gilli@joyent.com>
  2. @trevnorris

    smalloc: extend user API

    trevnorris authored
    node::Environment isn't accessible to user APIs, so extend smalloc to
    also accept v8::Isolate.
    
    Fixes: 75adde0 "src: remove `node_isolate` from source"
    PR-URL: iojs/io.js#905
    Reviewed-by: Fedor Indutny <fedor@indutny.com>
Commits on Feb 19, 2015
  1. @indutny @trevnorris

    net: unref timer in parent sockets

    indutny authored trevnorris committed
    `TLSSocket` wraps the original `net.Socket`, but writes/reads to/from
    `TLSSocket` do not touch the timers of original `net.Socket`.
    
    Introduce `socket._parent` property, and iterate through all parents
    to unref timers and prevent timeout event on original `net.Socket`.
    
    Fix: #9242
    PR-URL: iojs/io.js#891
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Commits on Feb 18, 2015
  1. @misterdjules

    console: allow Object.prototype fields as labels

    misterdjules authored
    This is a backport of 6c3647c from
    v0.12 to v0.10.
    
    Console.prototype.timeEnd() returns NaN if the timer label
    corresponds to a property on Object.prototype. In v0.12, this was fixed
    by using Object.create(null) to construct the _times object
    
    However, the version of V8 in the v0.10 branch makes this fix not work
    as expected. In v0.10, this commit changes the _times object into a
    array of objects of the form:
    
    { label: someLabel, time: staringWallClockTime }
    
    someLabel can thus be any string, including any string that represents
    any Object.prototype field.
    
    Fixes #9116.
    
    PR: #9215
    PR-URL: #9215
    Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Something went wrong with that request. Please try again.