Skip to content

Make internal function types not to be checked by the engine, #1354

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 10,000 commits into from

Conversation

smalyshev
Copy link
Contributor

but only by the functions themselves in zpp().

dstogov and others added 16 commits June 25, 2015 11:22
* PHP-5.6:
  backport missing rev bfdc9e2
* PHP-5.5:
  fix unknown size of void error
* PHP-5.6:
  fix unknown size of void error
ignore_user_abort() should take a bool not a string
…2_read with extra certs

Squashed commit of the following:

commit a64c1d9
Author: Tomasz Sawicki <falundir@gmail.com>
Date:   Wed Jun 24 08:49:37 2015 +0200

    Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs

    The "key values mismatch" error is triggered in openssl_pkcs12_read by
    PKCS12_parse, because it uses X509_check_private_key to separate main
    certificate (which corresponds to private key) from extra certificates.
    Extra certificates usually comes first (p12 contents are reversed as
    stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
    error.
    The fix pops "key values mismatch" error from OpenSSL error stack for
    each extra certificate if there are any.
* PHP-5.6:
  Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs
antonblanchard and others added 25 commits July 6, 2015 10:13
A char can be either signed or unsigned, and on PowerPC and ARM it is
unsigned. The following code will always be false on these architectures:

        if (c == -1) goto error;
backport for 5.6 to go
* PHP-5.6:
  Updated README, added test to create LDAP base if missing and ease tests
* PHP-5.6:
  Attempt at falling back on ldap_find_control for Mac OS
The CHECK_EXCEPTION() was done at a point where the old opline is
still used, thus redirecting the write to the result var into
EX(call) instead.

Handling the exception in-place to avoid leaking result.
Adds extra condition that the rope var of INIT/ADD must match the
one one END.
Matches behavior of zend_internal_type_error() if E_ERROR is passed to
zend_wrong_callback_error().
* PHP-5.5:
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/phar/phar_object.c
* PHP-5.6:
  update news
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
	ext/phar/phar_object.c
smalyshev added 2 commits July 7, 2015 00:02
* PHP-5.5:
  Better fix for bug #69958
  Better fix for bug #69958
* PHP-5.6:
  Better fix for bug #69958
  Better fix for bug #69958

Conflicts:
	ext/phar/phar_object.c
@smalyshev
Copy link
Contributor Author

Needs separate branch

@smalyshev smalyshev closed this Jul 27, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.