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

[1.2.3] Hardening fixes #1044

Merged
merged 15 commits into from Aug 9, 2013
Merged

[1.2.3] Hardening fixes #1044

merged 15 commits into from Aug 9, 2013

Conversation

ghost
Copy link

@ghost ghost commented Aug 9, 2013

No description provided.

sjinks added 15 commits August 9, 2013 12:28
(cherry picked from commit 0814cdc)
(cherry picked from commit 085c0a4)
(cherry picked from commit 216ad87)
(cherry picked from commit 019e563)
(cherry picked from commit 63d3703)
(cherry picked from commit bd5edb1)
(cherry picked from commit 17d5f39)
(cherry picked from commit 57b3722)

Conflicts:
	ext/dispatcher.c
(cherry picked from commit c80c9f3)

Conflicts:
	ext/cli/console.c
(cherry picked from commit bc9586c)

Conflicts:
	ext/logger/adapter/file.c
	ext/logger/adapter/file.h
phalcon pushed a commit that referenced this pull request Aug 9, 2013
[1.2.3] Hardening fixes
@phalcon phalcon merged commit afef4e4 into phalcon:1.2.3 Aug 9, 2013
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