1
0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Commit Graph

1024 Commits

Author SHA1 Message Date
Anatoliy Belsky a36a5315b8 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fixed tests for gd having freetype >= 2.4.10
2012-10-12 19:38:13 +02:00
Anatoliy Belsky 131d7d7a89 fixed tests for gd having freetype >= 2.4.10 2012-10-12 19:34:31 +02:00
Xinchen Hui e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui 610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Anatoliy Belsky 9a99426e80 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  exposing the libxpm version in phpinfo
2012-10-04 18:21:07 +02:00
Anatoliy Belsky 5d9fb8ffeb exposing the libxpm version in phpinfo 2012-10-04 18:20:02 +02:00
Anatoliy Belsky 26e492f2f3 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  reverted the previous fix for libpng include
2012-10-02 10:00:09 +02:00
Anatoliy Belsky 92a46fe07e reverted the previous fix for libpng include 2012-10-02 09:57:44 +02:00
Anatoliy Belsky 45351eaab4 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fixed include checks for libpng under win
2012-10-02 09:40:42 +02:00
Anatoliy Belsky 0165eec1ea fixed include checks for libpng under win 2012-10-02 09:39:34 +02:00
Xinchen Hui 9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	ext/interbase/interbase.rc
2012-09-05 23:11:19 +08:00
Xinchen Hui d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Anatoliy Belsky 69b2570b72 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt
  updated the NEWS with the latest fileinfo changes

Conflicts:
	NEWS
2012-04-04 18:54:03 +02:00
Matt Ficken 381edb425e Fix bug #61480 test bug - ext/gd/tests/bug48555.phpt 2012-04-04 18:39:24 +02:00
Felipe Pena e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena 4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Florian Anderiasch 6972b94ae5 Fixed #60160 and added a test for it 2011-11-01 11:51:53 +00:00
Florian Anderiasch 58a134fb48 Fixed #60160 and added a test for it 2011-11-01 11:51:53 +00:00
Xinchen Hui 1159cd2002 move it to right place 2011-09-06 09:45:21 +00:00
Xinchen Hui ddd98a9adc move it to right place 2011-09-06 09:45:21 +00:00
Felipe Pena 23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena 4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena 32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Rafael Machado Dohms 6406521a44 Adding testcases to validate imageloadfont input parameter validation, tests were developed at #tek11 testfest 2011-05-31 21:38:23 +00:00
Rafael Machado Dohms b903587268 Adding testcases to validate imageloadfont input parameter validation, tests were developed at #tek11 testfest 2011-05-31 21:24:10 +00:00
Rasmus Lerdorf 2954832b97 Check headers first and let the CHECK_LIBRARY macro
handle checking for the library. This makes it 
correctly handle non-standard system paths as long
as gcc knows about them. Should fix the build on
Ubuntu natty.
2011-05-12 08:19:37 +00:00
Rasmus Lerdorf 155972b117 Check headers first and let the CHECK_LIBRARY macro
handle checking for the library. This makes it 
correctly handle non-standard system paths as long
as gcc knows about them. Should fix the build on
Ubuntu natty.
2011-05-12 08:19:37 +00:00
Pierre Joye c278fb01d0 - malloc may fail 2011-01-19 15:23:07 +00:00
Pierre Joye f47405315d - malloc may fail 2011-01-19 15:23:07 +00:00
Pierre Joye 2171932624 - useless commented code 2011-01-03 20:38:21 +00:00
Pierre Joye 95dbc9d3f0 - slightly cleaner 2011-01-03 15:36:39 +00:00
Pierre Joye 0ebbe5e450 - fix crash when argc > 1 and to_zval is NULL (thx tony for the headup) 2011-01-03 15:35:01 +00:00
Pierre Joye 0df43f2803 - kill c++ comment 2011-01-03 09:33:27 +00:00
Pierre Joye 63aae8a69b - stream output support for image outputs functions 2011-01-03 09:22:58 +00:00
Felipe Pena 927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena 0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye 19ba599166 - WS 2010-12-28 17:20:10 +00:00
Pierre Joye 05be26d13a - WS 2010-12-28 17:20:10 +00:00
Pierre Joye aea6771d19 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
Pierre Joye a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Martin Jansen f6cedd2ad5 Merge from trunk:
* Fixed parameter check introduced with the recent fix for bug #53492.

* Improved the error message along the way.
2010-12-11 20:10:39 +00:00
Martin Jansen 02ff4766c9 * Fixed parameter check introduced with the recent fix for bug #53492.
* Improved the error message along the way.
2010-12-11 20:09:39 +00:00
Pierre Joye 088a6ad7b5 - Fix #53492, fix crash if aa steps are invalid 2010-12-08 08:45:56 +00:00
Pierre Joye a0eb5848b5 - Fix #53492, fix crash if aa steps are invalid 2010-12-08 08:45:56 +00:00
Pierre Joye ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +00:00
Pierre Joye 76d273d455 - don't build if no libvpx available 2010-10-06 09:02:08 +00:00
Ilia Alshanetsky 7b2a2eb326 Removed debug code 2010-10-05 12:27:00 +00:00
Felipe Pena f1d905a417 - Fix build 2010-10-04 23:05:32 +00:00
Pierre Joye 12f855b3be - missing file for webp 2010-10-04 22:34:02 +00:00
Pierre Joye dfb96b3b95 - initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g) 2010-10-04 22:33:07 +00:00