Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport fixes to v1.x #1560

Merged
merged 6 commits into from
May 14, 2015
Merged

Conversation

Fishrock123
Copy link
Contributor

Just fixes. Especially to the tests and how the CI runs are now run, this will make v1.x CI runs viable again.

Also, due to the string_decoder thing, might be worthwhile to do a 1.8.2 in the coming weeks.

@mscdex mscdex added the meta Issues and PRs related to the general management of the project. label Apr 29, 2015
@bnoordhuis
Copy link
Member

LGTM

@Fishrock123
Copy link
Contributor Author

fwiw I'd like to sort out #1559 first just in the case that we create further issues.

@chrisdickinson
Copy link
Contributor

When these commits are cherry-picked, it'd probably be good to add metadata to the messages along the lines of Port: v2.x / <original-sha1>. What do you think?

@Fishrock123
Copy link
Contributor Author

@chrisdickinson original shas are easy-ish to find via the original PR. I'm more concerned about these port PRs actually. It's been hard to find PRs where colin merged in commits from node in the past, for example.

(Although we could do both, doesn't need the full original SHA.)

@Fishrock123
Copy link
Contributor Author

Going to land with this metadata, and create a second backport pr.

PORT-PR-URL: https://github.com/iojs/io.js/pull/1560
PORT-FROM: v2.x / <original-sha1>

sitegui and others added 6 commits May 14, 2015 11:45
tls.connect(options) with no options.host should accept a certificate
with CN: 'localhost'. Fix Error: Hostname/IP doesn't match
certificate's altnames: "Host: undefined. is not cert's CN: localhost"

'localhost' is not added directly to defaults because that is not
always desired (for example, when using options.socket)

PR-URL: nodejs#1493
PORT-PR-URL: nodejs#1560
PORT-FROM: v2.x / a7d7463
Fixes: nodejs#1489
Reviewed-By: Brendan Ashworth <[email protected]>
Reviewed-By: Roman Reiss <[email protected]>
PR-URL: nodejs#1530
PORT-PR-URL: nodejs#1560
PORT-FROM: v2.x / 5472139
Reviewed-By: Johan Bergström <[email protected]>
parallel tests still not working on most build slaves

PR-URL: nodejs#1544
PORT-PR-URL: nodejs#1560
PORT-FROM: v2.x / 2a3c8c1
Reviewed-By: Johan Bergström <[email protected]>
Some modules are monkey-patching Buffer.isEncoding, so without this
they cannot do that.

Fixes: nodejs#1547
PR-URL: nodejs#1548
PORT-PR-URL: nodejs#1560
PORT-FROM: v2.x / 0fa6c4a
Reviewed-By: Evan Lucas <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
PR-URL: nodejs#1553
PORT-PR-URL: nodejs#1560
PORT-FROM: v2.x / f9c681c
Reviewed-By: Colin Ihrig <[email protected]>
Based on tests running on original Raspberry Pi

PR-URL: nodejs#1554
PORT-PR-URL: nodejs#1560
PORT-FROM: v2.x / f9b226c
Reviewed-By: Roman Reiss <[email protected]>
@Fishrock123 Fishrock123 merged commit 32a6dbc into nodejs:v1.x May 14, 2015
This was referenced May 14, 2015
@jbergstroem
Copy link
Member

What's the benefit of adding branch in port-from?

Edit: gotcha. Full history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
meta Issues and PRs related to the general management of the project.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants