summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Patch core for PCRE2 supportAnatol Belski2017-11-131-0/+1
| | | | RFC https://wiki.php.net/rfc/pcre2-migration
* Clean and sync .gitignorePeter Kokot2017-10-191-61/+48
|
* Join untracked files to root .gitignorePeter Kokot2017-10-051-1/+7
|
* Merge branch 'PHP-7.1' into PHP-7.2Anatol Belski2017-09-251-2/+0
|\ | | | | | | | | * PHP-7.1: Remove some old sapi/apache_hooks and sapi/apache leftovers
| * Remove some old sapi/apache_hooks and sapi/apache leftoversPeter Kokot2017-09-251-2/+0
| |
* | add oniguruma.patch to ease future upgradesAnatol Belski2017-07-131-0/+5
| |
* | Clean up .gitignoreRichard Fussenegger2017-06-071-85/+27
| | | | | | | | | | Simply test rules using ** globs, remove some outdated rules and group some rules differently.
* | Use modern autotools name of configure.ac instead of configure.inBrian Evans2017-01-271-0/+2
| | | | | | | | | | | | | | | | | | | | configure.ac was introduced in 2001 with automake-1.15 and autoconf-2.50 to replace the file named configure.in. Autotools is preparing to remove configure.in in Automake 2.0. All new software should be using configure.ac. This also fixes Bug #69770 where extensions are creating configure.in Signed-off-by: Brian Evans <grknight@gentoo.org>
* | Improve the config.simple.bat for Windows a little;Kalle Sommer Nielsen2016-10-191-2/+1
| | | | | | | | This adds --with-config-profile=foobar, this generates a config.foobar.bat file in the root of php-src directory with the relevant configuration arguments.
* | Added config.simple.bat to .gitignoreKalle Sommer Nielsen2016-10-181-0/+1
|/
* Merge branch 'PHP-5.6' into PHP-7.0Christoph M. Becker2016-09-111-0/+1
|\
| * A picture is worth a thousand message digestsChristoph M. Becker2016-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bundled GD test suites makes heavy use of md5() to verify the result of drawing operations. This leads to fragile tests (even a slight change in a PNG header would cause failure, and of course there is the possibility of collisions), and even worse, eventual test failures are rather unrevealing. Therefore we replace all md5() verification with a simplistic test_image_equals_file(), which is basically a simplified port of libgd's gdTestImageCompareToFile(), adapted to the needs of PHPTs. In the long run better tests helpers should be introduced (see also <http://news.php.net/php.internals/94081>), but for now this solution is preferable over the former. (cherry picked from commit 24f9e96792518ec2a75f26b1eb2471dd7694f2b7)
* | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2015-12-171-4/+0
|\ \ | |/ | | | | | | Conflicts: ext/opcache/Optimizer/pass1_5.c
| * Remove sqlite extension leftover references (was removed in PHP 5.4)Lior Kaplan2015-12-161-4/+0
| |
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-08-041-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: Zend/zend_exceptions.c ext/date/php_date.c ext/openssl/openssl.c ext/phar/phar_internal.h ext/soap/php_http.c ext/spl/spl_array.c ext/spl/spl_dllist.c ext/spl/spl_observer.c ext/standard/tests/serialize/bug69152.phpt sapi/cli/tests/005.phpt
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-08-041-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS fix test update NEWS Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: ext/soap/php_http.c ext/spl/spl_observer.c
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-08-041-0/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #70019 - limit extracted files to given directory Do not do convert_to_* on unserialize, it messes up references Fix #69793 - limit what we accept when unserializing exception Fixed bug #70169 (Use After Free Vulnerability in unserialize() with SplDoublyLinkedList) Fixed bug #70166 - Use After Free Vulnerability in unserialize() with SPLArrayObject ignore signatures for packages too Fix bug #70168 - Use After Free Vulnerability in unserialize() with SplObjectStorage Fixed bug #69892 Fix bug #70014 - use RAND_bytes instead of deprecated RAND_pseudo_bytes Improved fix for Bug #69441 Fix bug #70068 (Dangling pointer in the unserialization of ArrayObject items) Fix bug #70121 (unserialize() could lead to unexpected methods execution / NULL pointer deref) Fix bug #70081: check types for SOAP variables Conflicts: .gitignore ext/date/php_date.c ext/spl/spl_array.c ext/spl/spl_observer.c
| | | * ignore signatures for packages tooStanislav Malyshev2015-08-011-0/+2
| | | |
* | | | Remove these old references to the DSP files we don't use anymoreKalle Sommer Nielsen2015-06-221-2/+0
| | | |
* | | | Add missing path to .gitignoreFrancois Laupretre2015-06-171-0/+1
| | | |
* | | | add a custom built pear installer until we have an official release with ↵Ferenc Kovacs2015-01-261-1/+1
| | | | | | | | | | | | | | | | php7 compat. see https://github.com/pear/pear-core/pull/33 for the details
* | | | Merge branch 'PHP-5.6'Ferenc Kovacs2014-10-021-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * PHP-5.6: we also have xz release tarballs since 5.5 5.5.19 now
| * | | Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2014-10-021-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: we also have xz release tarballs since 5.5 5.5.19 now Conflicts: configure.in main/php_version.h
| | * | we also have xz release tarballs since 5.5Ferenc Kovacs2014-10-021-0/+1
| | | |
* | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-201-4/+4
| | | |
* | | | add a few more patterns to .gitignoreNuno Lopes2014-08-311-0/+25
|/ / /
* | | Added autogenerated phpdbg parser files to .gitignoreBob Weinand2014-04-221-0/+2
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Will Fitch2014-01-231-0/+4
|\ \ | |/ | | | | | | * PHP-5.4: Update gitignore and Makefile for additional entries
| * Update gitignore and Makefile for additional entriesWill Fitch2014-01-231-0/+4
| |
* | Ignore Zend/zend_dtrace_gen.h and Zend/zend_dtrace_gen.hbakSebastian Bergmann2012-12-161-0/+2
|/
* Ignore the tempoary filesXinchen Hui2012-03-221-0/+12
|
* Ignore the temporay files in sapi/*/tests/Xinchen Hui2012-03-201-0/+8
|
* Add missing files.Sebastian Bergmann2012-03-191-0/+13
|
* Add .gitignoreDavid Soria Parra2012-03-191-0/+221
The gitignore file was created using git svn show-ignore and the overlapping patterns were removed.