Skip to content
This repository has been archived by the owner on Aug 30, 2023. It is now read-only.

BUG: Restore Request.InputStream position after body has been read #210

Closed
wants to merge 3 commits into from
Closed

Conversation

brunoblank
Copy link

Hi, this is a PR for issue: #209

Restore the Request.InputStream.Position to the position before the body was read.

Regards
Bruno

@asbjornu
Copy link
Contributor

@brunoblank: Thanks for this. Can you please look into why both AppVeyor and Travis is failing the build?

@brunoblank
Copy link
Author

I have done this bugfix in master as I assumed this the released version. The build error and test errors seems to be missing nuget packages / NameResolution error, which my changed should not affect.
When I switch to the develop branch alot of build realated things as been updated.

Where should the bug-fix be commited?

@asbjornu
Copy link
Contributor

@brunoblank: You should preferably create your branch from develop. To repurpose your fix onto a branch created from develop you can do the following:

git checkout develop                            # Assumes you have the latest develop from this repository
git checkout -b feature/reset-stream-position   # Creates and checks out a new branch from the HEAD of develop
git cherry-pick --no-edit e246eda               # Cherry-picks your "BUG: Restore Request.InputStream position after body has been read" commit into the feature/reset-stream-position branch
git cherry-pick --no-edit 896a40c               # Cherry-picks your "Added project setting for Net3.5 for SharpRaven.Nancy and SharpRaven" commit into the feature/reset-stream-position branch
git push

This will create a new branch from develop which you can create a new pull request for. The idea behind having this in a separate branch is so you can make changes in master without affecting the pull request.

I'm also not sure about 1e6549b. Has Xbuild been completely phased out?

@brunoblank
Copy link
Author

Hi, thanks for the separate branch tip.

896a40c and 1e6549b can be ignored as they were added to try to figure out why travis was failing.

New PR #215 has been submitted.

Closing PR

@brunoblank brunoblank closed this Feb 14, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants