summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5'Christopher Jones2013-07-313-5/+4
|\ | | | | | | | | | | * PHP-5.5: Use PHP's major version when cleaning up Apache .module files Allow 'make distclean' to clean up the 'generated' phar.inc
| * Use PHP's major version when cleaning up Apache .module filesChristopher Jones2013-07-311-2/+1
| |
| * Merge branch 'phardistclean' into PHP-5.5Christopher Jones2013-07-313-3/+3
| |\ | | | | | | | | | | | | * phardistclean: Allow 'make distclean' to clean up the 'generated' phar.inc
| | * Allow 'make distclean' to clean up the 'generated' phar.incChristopher Jones2013-07-313-3/+3
| |/
* | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-07-3138-189/+202
|\ \ | | | | | | | | | | | | * 'master' of https://git.php.net/repository/php-src: Constify streams API and a few other calls down the rabbit hole. (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
| * \ Merge branch 'pull-request/399'Sara Golemon2013-07-3138-189/+202
| |\ \
| | * | Constify streams API and a few other calls down the rabbit hole.Andrey Hristov2013-07-3038-189/+202
| | | | | | | | | | | | | | | | | | | | (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
* | | | Clean generated OCI8 DTrace files in 'make distclean'Christopher Jones2013-07-311-1/+1
| | | |
* | | | Merge branch 'PHP-5.5'Christopher Jones2013-07-311-2/+9
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| * PHP-5.5: Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
| * | Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell ↵Christopher Jones2013-07-311-2/+9
| | | | | | | | | | | | redirection etc.
* | | Merge branch 'PHP-5.5'Christopher Jones2013-07-312-2/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
| * | Fixed bug #62691 (solaris sed has no -i switch)Christopher Jones2013-07-313-3/+4
| | | | | | | | | | | | Make 'make distclean' remove generated DTrace .h file
| * | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-07-3116-281/+525
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of https://git.php.net/repository/php-src: Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL) Fixed bug #65018 (SoapHeader problems with SoapServer) Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s) MFH: fixed #65045: mb_convert_encoding breaks well-formed character. Fixed php-5.2 support added test script for bug65045. MFH: fixed #65045: mb_convert_encoding breaks well-formed character. Added support for glob symbols in blacklist entries (?, *, **) Fixed bug #65336
* | \ \ Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-07-3110-79/+303
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://git.php.net/repository/php-src: Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL) Fixed bug #65018 (SoapHeader problems with SoapServer) Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s) MFH: fixed #65045: mb_convert_encoding breaks well-formed character. Fixed php-5.2 support added test script for bug65045. MFH: fixed #65045: mb_convert_encoding breaks well-formed character. Added support for glob symbols in blacklist entries (?, *, **) Fixed bug #65336
| * \ \ \ Merge branch 'PHP-5.5'Dmitry Stogov2013-07-311-5/+49
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * PHP-5.5: Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-07-311-5/+49
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
| | | * | | Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)Dmitry Stogov2013-07-311-5/+49
| | | | | |
| * | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-312-38/+83
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #65018 (SoapHeader problems with SoapServer) MFH: fixed #65045: mb_convert_encoding breaks well-formed character. Fixed bug #65336 Conflicts: NEWS
| | * | | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-07-313-38/+86
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #65018 (SoapHeader problems with SoapServer) MFH: fixed #65045: mb_convert_encoding breaks well-formed character. Fixed bug #65336 Conflicts: NEWS
| | | * | | Fixed bug #65018 (SoapHeader problems with SoapServer)Dmitry Stogov2013-07-313-38/+86
| | | | | |
| | | * | | MFH: fixed #65045: mb_convert_encoding breaks well-formed character.Rui Hirokawa2013-07-315-202/+215
| | | | | |
| | | * | | Fixed bug #65336Yasuo Ohgaki2013-07-272-1/+6
| | | | | |
| | | * | | Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-07-250-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.4' of https://git.php.net/repository/php-src:
| | | | * \ \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-07-253-1/+352
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.4' of https://git.php.net/repository/php-src: Upper section name Fixed bug #65328 (Segfault when getting SplStack object Value)
| | | * | \ \ \ Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-07-257-6/+540
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Xinchen Hui (2) and others # Via Stanislav Malyshev (1) and Xinchen Hui (1) * 'PHP-5.4' of https://git.php.net/repository/php-src: Upper section name Fixed bug #65328 (Segfault when getting SplStack object Value) Fix compiler warning on redefined constant fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
| | | * | | | | Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4Christopher Jones2013-07-22133-393/+639
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Anatol Belski (8) and others # Via Anatol Belski (2) and others * 'PHP-5.4' of https://git.php.net/repository/php-src: (44 commits) fixed possible null deref - addressed bug #65159, Misleading configure help text for --with-mysql-sock Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT Fixed bug #65304 (Use of max int in array_sum) Reorder NEWS Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait Properly fixed bug #63186 on NetBSD == 6.0 Improve php.ini-* documentation 5.4.19 is next Fixed bug #50308 - session id not appended properly for empty anchor tags Fix bug #62129 - rfc1867 crashes php even though turned off add news for xml fix fix TS build added sapi check for dl() test Make zval2myslqnd implementations aware of inheritance Fixed typo ensuring header str is \0 terminated fix buffer overrun fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too) ...
| * | | \ \ \ \ \ Merge branch 'PHP-5.5'Dmitry Stogov2013-07-313-0/+37
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s) added test script for bug65045. MFH: fixed #65045: mb_convert_encoding breaks well-formed character. Conflicts: NEWS
| | * | | | | | | Added opcache.restrict_api configuration directive that may limit usage of ↵Dmitry Stogov2013-07-314-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPcahce API functions only to patricular script(s)
| | * | | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-07-315-202/+215
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src: added test script for bug65045. MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
| | | * \ \ \ \ \ \ Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Rui Hirokawa2013-07-315-36/+128
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | added test script for bug65045.Rui Hirokawa2013-07-311-0/+29
| | | | | | | | | | |
| | | * | | | | | | | MFH: fixed #65045: mb_convert_encoding breaks well-formed character.Rui Hirokawa2013-07-314-202/+186
| | | | |_|_|_|_|/ / | | | |/| | | | | |
| * | | | | | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-311-0/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed php-5.2 support
| | * | | | | | | | Fixed php-5.2 supportDmitry Stogov2013-07-311-0/+8
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5Dmitry Stogov2013-07-310-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of git.php.net:php-src:
| | | * | | | | | Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5Christopher Jones2013-07-302-40/+50
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'PHP-5.5' of https://git.php.net/repository/php-src: Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw) A minor fix for configure outpu (Tony)
| * | | \ \ \ \ \ \ Merge branch 'master' of git.php.net:php-srcDmitry Stogov2013-07-312-2/+2
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git.php.net:php-src: Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
* | | | | | | | | | Merge branch 'master' of https://git.php.net/repository/php-srcChristopher Jones2013-07-302-40/+50
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://git.php.net/repository/php-src: Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw) A minor fix for configure outpu (Tony)
* | | | | | | | | | | Remove tabs on blanklines in Makefile sources. This prevents aChristopher Jones2013-07-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'suspicious line' warning when editing & saving Makefile using Emacs.
| | * | | | | | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-314-36/+126
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | _ / / / / / / / | | | / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Added support for glob symbols in blacklist entries (?, *, **) Conflicts: NEWS
| | * | | | | | | | Added support for glob symbols in blacklist entries (?, *, **)Dmitry Stogov2013-07-315-36/+128
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-301-39/+47
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
| | * | | | | | | Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)Dmitry Stogov2013-07-301-39/+47
| | | | | | | | |
| * | | | | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-301-1/+3
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | _ / / / / / / | | / / / / / / | | | | | | | | * PHP-5.5: A minor fix for configure outpu (Tony)
| * | | | | | | A minor fix for configure outpu (Tony)Dmitry Stogov2013-07-301-1/+3
| |/ / / / / /
* | | | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-303-5/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown). Conflicts: NEWS
| * | | | | Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).Dmitry Stogov2013-07-304-5/+13
| | | | | |
* | | | | | make simplexml headers available to the outta worldAnatol Belski2013-07-292-0/+2
| | | | | |
* | | | | | Merge branch 'PHP-5.5'Dmitry Stogov2013-07-282-1/+5
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Merge from GitHub Update NEWS Fixed bug #65336 Conflicts: NEWS
| * | | | | Merge from GitHubDmitry Stogov2013-07-282-1/+5
| | | | | |