server onRequest handler no longer requires a socket in the request #9332
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Can one of the admins verify this patch? |
|
Figure I should note that I'd appreciate it if this can be backported through to whatever the next 5.0.x release will be when it's merged. |
|
@spalger Mind doing the review for this PR? |
cjcenizal
reviewed
Dec 8, 2016
| @@ -48,7 +48,7 @@ export default function (kbnServer, server, config) { | |||
| }); | |||
|
|
|||
| server.ext('onRequest', function (req, reply) { | |||
| if (req.raw.req.socket.encrypted) { | |||
| if (!req.raw.req.socket || req.raw.req.socket.encrypted) { | |||
There was a problem hiding this comment.
I think your description would make a great comment here, to explain the context:
// A request sent through a HapiJS .inject() doesn't have a socket associated with the request,
// which causes a failure.
if (!req.raw.req.socket || req.raw.req.socket.encrypted) {
|
jenkins, test this |
Per elastic#9302 A request sent through a HapiJS .inject() doesn't have a socket associated with the request, which causes a failure.
meganwalker-ibm
force-pushed
the
master
branch
from
509f763 to
a5452f7
Compare
|
I've added a comment as requested, as well as rebased on to master to pull in the latest commits :) |
spalger
approved these changes
Dec 9, 2016
|
jenkins, test this |
elastic-jasper
added a commit
that referenced
this pull request
Dec 10, 2016
Backports PR #9332 **Commit 1:** server onRequest handler no longer requires a socket in the request Per #9302 A request sent through a HapiJS .inject() doesn't have a socket associated with the request, which causes a failure. * Original sha: a5452f7 * Authored by Megan Walker <megan.walker@uk.ibm.com> on 2016-12-01T15:29:12Z
cjcenizal
pushed a commit
that referenced
this pull request
Dec 10, 2016
…9438) Backports PR #9332 **Commit 1:** server onRequest handler no longer requires a socket in the request Per #9302 A request sent through a HapiJS .inject() doesn't have a socket associated with the request, which causes a failure. * Original sha: a5452f7 * Authored by Megan Walker <megan.walker@uk.ibm.com> on 2016-12-01T15:29:12Z
cjcenizal
added
the
bug
|
Thanks for the PR @meganwalker-ibm ! |
epixa
added
the
Team:Core
danwhitacre
pushed a commit
to danwhitacre/kibana
that referenced
this pull request
Feb 6, 2017
…lastic#9332) Per elastic#9302 A request sent through a HapiJS .inject() doesn't have a socket associated with the request, which causes a failure.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per #9302 A request sent through a HapiJS .inject() doesn't have
a socket associated with the request, which causes a failure.
NB: I haven't included new tests with this, as I can't workout how best to test it without adding two additional routes to src/server/http/index.js which seems incredibly heavy weight. I'm open to suggestions on how best to add a test to this though.