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

fix bugs in CRLF injection protection #2

Merged
merged 9 commits into from
Jun 29, 2015
Merged

fix bugs in CRLF injection protection #2

merged 9 commits into from
Jun 29, 2015

Conversation

chadwhitacre
Copy link
Contributor

Fixes #1.

@chadwhitacre chadwhitacre changed the title add CR injection protection fix bugs in CRLF injection protection Jun 29, 2015
@chadwhitacre
Copy link
Contributor Author

Ready for review, @pjz.

@chadwhitacre
Copy link
Contributor Author

@pjz Let's merge this and then cut a release, eh?

pjz added a commit that referenced this pull request Jun 29, 2015
fix bugs in CRLF injection protection
@pjz pjz merged commit d8170a6 into upstream Jun 29, 2015
@chadwhitacre
Copy link
Contributor Author

Gah, I effed us up with a force-push to upstream, sorry @pjz. :-/

/me looking at repair ...

@chadwhitacre
Copy link
Contributor Author

(I was confused as to why AppVeyor was on this PR.)

@pjz
Copy link

pjz commented Jun 29, 2015

You should be able to set the output of this merge as master, no?

@chadwhitacre
Copy link
Contributor Author

@pjz I just went ahead and merged locally and pushed in:

AspenWeb/pando.py@a87e622
AspenWeb/pando.py@a32cbe5
AspenWeb/pando.py@02109fe

@chadwhitacre chadwhitacre deleted the security-qf35us branch June 29, 2015 23:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants