Skip to content

Pull for PHP 5.3 final release patches #730

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

Closed
wants to merge 32 commits into from

Conversation

smalyshev
Copy link
Contributor

No description provided.

remicollet and others added 29 commits June 13, 2014 16:41
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
Conflicts:
	ext/date/lib/parse_iso_intervals.c
Conflicts:
	ext/fileinfo/libmagic/readcdf.c
	ext/fileinfo/tests/finfo_file_002.phpt
Conflicts:
	ext/fileinfo/libmagic/readcdf.c
…ary check

Upstream:
file/file@36fadd2

Conflicts:
	ext/fileinfo/libmagic/cdf.c
Conflicts:
	ext/standard/basic_functions.c
… Confusion

Conflicts:
	ext/spl/spl_array.c
	ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
@pbowyer
Copy link

pbowyer commented Jul 21, 2014

Could we please include the patch for bug #67541 too? It makes php-fpm work with Apache 2.4.9+'s new SetHandler way of invoking php-fpm. This is much easier than using ProxyPassMatch (which prevents rewriting and other stuff), and I have been using it in production with great success (along with Heroku)

@lukaskuzmiak
Copy link

As this is already being done I'd propose to also fix #67538 and #67539.

Commits for those 2 bugs are:
df78c48354f376cf419d7a97f88ca07d572f00fb
22882a9d89712ff2b6ebc20a689a89452bba4dcd

@php-pulls
Copy link

Comment on behalf of nikic at php.net:

Closing, as the final 5.3 has been released.

@php-pulls php-pulls closed this Aug 26, 2014
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.

8 participants