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.

Sign up for GitHub

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

Jump to bottom

[2.3] moved a security check in HttpUploadedFile #7201

Merged
merged 1 commit into from Mar 23, 2013
Merged

[2.3] moved a security check in HttpUploadedFile #7201

merged 1 commit into from Mar 23, 2013

Conversation

bamarni
Copy link
Contributor

@bamarni bamarni commented Feb 27, 2013

closes #6802

  • fix the testsuite, I've only run the component suite, but it needs to be updated in other places too (according to travis)

@bamarni bamarni mentioned this pull request Feb 27, 2013
Closed
@bamarni
Copy link
Contributor Author

bamarni commented Feb 27, 2013

it failed on 2/4 travis builds (under php 5.4), do you think it's because of me?

@fabpot
Copy link
Member

fabpot commented Mar 23, 2013

Looks good to me. Can you rebase and squash your commits? Thanks.

@bamarni
[HttpFoundation] UploadedFile - moved a security check
5bb44f5 
Squashed commit of the following:

commit b03b32ecc985c4a4f9dc7df2d3336a4cd75aae30
Merge: fb7004b fc70e13
Author: Bilal Amarni <bilal.amarni@gmail.com>
Date:   Wed Feb 27 11:33:37 2013 +0100

    [HttpFoundation] UploadedFile - moved a security check

commit fc70e13
Author: Bilal Amarni <bilal.amarni@gmail.com>
Date:   Thu Jan 24 11:07:29 2013 +0100

    explicitly passed UPLOAD_ERR_OK constant in a test

commit dda03a2
Author: Bilal Amarni <bilal.amarni@gmail.com>
Date:   Fri Jan 18 17:24:06 2013 +0100

    [HttpFoundation] UploadedFile - moved a security check from move() to isValid()
@bamarni
Copy link
Contributor Author

bamarni commented Mar 23, 2013

I've just squashed them.

fabpot added a commit that referenced this pull request Mar 23, 2013
@fabpot
merged branch bamarni/http-uploaded-file (PR #7201)
2b4cfbd 
This PR was merged into the master branch.

Discussion
----------

[2.3] moved a security check in HttpUploadedFile

closes #6802

- [x] fix the testsuite, I've only run the component suite, but it needs to be updated in other places too (according to travis)

Commits
-------

5bb44f5 [HttpFoundation] UploadedFile - moved a security check
@fabpot fabpot merged commit 5bb44f5 into symfony:master Mar 23, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@bamarni @fabpot