clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,790 Commits 494 Branches 1,367 Tags 807 MiB
b668a26c2f
Commit Graph

1194 Commits

Author SHA1 Message Date
Pierre Joye
24f1045d55 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix possible NULL deref
 2013-04-09 10:09:47 +02:00
Pierre Joye
aab5659357 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix possible NULL deref
 2013-04-09 10:09:36 +02:00
Pierre Joye
88b3cdc4e9 fix possible NULL deref 2013-04-09 10:09:17 +02:00
Pierre Joye
f4308084d8 Merge branch 'PHP-5.5' 
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
 2013-04-09 10:04:41 +02:00
Pierre Joye
4d6c367177 Merge branch 'PHP-5.4' into PHP-5.5 
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.4:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
 2013-04-09 10:04:32 +02:00
Pierre Joye
10d62de4aa Merge branch 'PHP-5.3' into PHP-5.4 
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.3:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
 2013-04-09 10:04:17 +02:00
Pierre Joye
4d4adf47e0 fix null deref 2013-04-09 10:04:01 +02:00
Pierre Joye
396b1109cf Merge branch 'PHP-5.5' 
* PHP-5.5:
  ws and comment for recommended aa method
 2013-04-09 07:05:03 +02:00
Pierre Joye
83500123d0 ws and comment for recommended aa method 2013-04-09 07:04:52 +02:00
Pierre Joye
21cfbdf42c Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix some unitialized values and typo
 2013-04-09 06:45:24 +02:00
Pierre Joye
85ad65ef40 fix some unitialized values and typo 2013-04-09 06:44:45 +02:00
Pierre Joye
95f830bc81 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix BELL constant declaration
 2013-03-28 22:14:50 +01:00
Pierre Joye
ac0b66f160 fix BELL constant declaration 2013-03-28 22:14:34 +01:00
Pierre Joye
33e834aab8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  add WebP support in phpinfo
 2013-03-27 17:39:05 +01:00
Pierre Joye
e7d88a63fa add WebP support in phpinfo 2013-03-27 17:38:57 +01:00
Pierre Joye
705ab20252 Merge branch 'PHP-5.5' 
* PHP-5.5:
  FALSE on error
 2013-03-27 05:13:42 +01:00
Pierre Joye
f3ebb40ad6 FALSE on error 2013-03-27 05:13:30 +01:00
Pierre Joye
8a85da4a61 merging conflict left over 2013-03-26 17:46:29 +01:00
Pierre Joye
111123af4f conflict 2013-03-26 11:24:00 +01:00
Pierre Joye
5ae6f582fb fix regression, take #2 (merge issue due to git 1.8 default setting changes) 2013-03-26 11:23:15 +01:00
Stanislav Malyshev
c1ac5a20a5 fix typo 2013-03-24 20:04:24 -07:00
Stanislav Malyshev
504ef64c7b fix typo 2013-03-24 20:03:57 -07:00
Pierre Joye
f21f37bb4c Merge branch 'PHP-5.5' 
* PHP-5.5:
  remove comments
 2013-03-25 03:14:40 +01:00
Pierre Joye
1b34ab8ff8 remove comments 2013-03-25 03:14:27 +01:00
Pierre Joye
94c083ba64 fix conflict 2013-03-24 16:54:55 +01:00
Pierre Joye
be3e2bb295 fix generic rotation and 90 degrees & multiples rotation, take #2 2013-03-24 16:52:20 +01:00
Pierre Joye
dd9e4b34d6 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt), fix for all cases
 2013-03-22 09:30:32 +01:00
Pierre Joye
f39a23696b - fix regression (imagerotate_overflow.phpt), fix for all cases 2013-03-22 09:30:23 +01:00
Pierre Joye
672f8525fb Merge branch 'PHP-5.5' 
* PHP-5.5:
  - fix regression bug24155.phpt and bug39366.phpt
 2013-03-22 09:21:23 +01:00
Pierre Joye
f05972ddbf - fix regression bug24155.phpt and bug39366.phpt 2013-03-22 09:21:11 +01:00
Pierre Joye
2a8a9c0007 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt)
 2013-03-22 08:28:25 +01:00
Pierre Joye
4e6d54f5a7 - fix regression (imagerotate_overflow.phpt) 2013-03-22 08:28:11 +01:00
Pierre Joye
09854f1fb9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - add gd changes

Conflicts:
	UPGRADING
 2013-03-20 12:34:51 +01:00
Pierre Joye
f0078897c7 - update the comment to match the code/features 2013-03-20 12:29:47 +01:00
Pierre Joye
1ec484d3c5 - add imageaffinematrixget and imagematrixconcat 2013-03-20 12:19:03 +01:00
Pierre Joye
780c6e0a9c - add affine matrix helper for translate, scale, rotate and shear 2013-03-20 11:01:37 +01:00
Pierre Joye
a46065ef71 - fix unix build 2013-03-20 09:24:54 +01:00
Pierre Joye
a7a53d369b - add new files for interpolation 2013-03-20 08:10:54 +01:00
Pierre Joye
00a53ca817 - config.m4 sync with .w32 2013-03-20 07:52:23 +01:00
Pierre Joye
22159fb7b7 - add new interpolation method 
. imagescale
  . imageaffine
  . replace imagerotate with new generic and optimized new implementations
  . imagesetinterpolationmethod, to set the default interpolation to be
    used with the new functions
  . add imagepalettetotruecolor
 2013-03-20 07:46:59 +01:00
Pierre Joye
0404c38615 - fix path 2013-03-04 14:14:09 +01:00
Pierre Joye
5001f40e82 - add noisy php logo for autocrop with threshold test 2013-03-04 12:05:59 +01:00
Pierre Joye
2024ff3b61 - add test for imagecropauto 2013-03-04 07:26:07 +01:00
Pierre Joye
0a55c4b1dd - (s)rgb distance works way better for now, re enable threshold 2013-03-03 05:30:12 +01:00
Pierre Joye
7698bc5735 - disable threshold for now, will enable it again using CIEDE2000 2013-03-01 08:10:49 +01:00
Pierre Joye
22aeb976e0 - add todo for threshold 2013-02-28 19:34:14 +01:00
Pierre Joye
0c32a18d4c - clean and enable threshold 2013-02-28 19:22:06 +01:00
Pierre Joye
a991360344 - add image crop support 2013-02-28 17:24:23 +01:00
Pierre Joye
82765a0780 - typo 2013-02-27 21:02:47 +01:00
Pierre Joye
74983a45cc - fix name for imageflip constants, consistent witht the other 2013-02-27 20:23:31 +01:00
Pierre Joye
03d0bf633d - add test 2013-02-27 20:22:45 +01:00
Pierre Joye
34adce6c47 - add constants for imageflip 2013-02-27 20:08:26 +01:00
Pierre Joye
efffdb4d7f - add only once 2013-02-27 16:03:17 +01:00
Pierre Joye
98e43de7c5 - add new file for m4 as well 2013-02-27 16:02:54 +01:00
Pierre Joye
fa940a60de - add image flip API support 2013-02-27 10:39:25 +01:00
Pierre Joye
e6414140e6 - add image flip API support 2013-02-27 10:39:16 +01:00
Pierre Joye
af5bf879aa - add image flip API support 2013-02-27 10:39:09 +01:00
Pierre Joye
6a3623e199 - add image flip API support 2013-02-27 10:38:33 +01:00
Pierre Joye
246de922e6 - add image flip API support 2013-02-27 10:37:48 +01:00
Anatoliy Belsky
215da6057f make libvpx optional 2013-02-06 16:22:27 +01:00
Anatoliy Belsky
263a220997 allow for libpng 1.5.x 2013-01-28 13:23:31 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Rasmus Lerdorf
a983ded9bd Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 2012-11-05 20:58:04 -08:00
Rasmus Lerdorf
f8c280d85a These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:57:15 -08:00
Rasmus Lerdorf
f452b9056e These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:57:07 -08:00
Rasmus Lerdorf
261e32f623 These need to be volatile in order to prevent leaking after the 
longjmp in the error handler
 2012-11-05 20:56:19 -08:00
Anatoliy Belsky
e3ac418309 enabled libxpm for gd on windows 2012-10-24 10:36:52 +02:00
Anatoliy Belsky
b48e163c35 enabled libxpm for gd on windows 2012-10-24 10:26:27 +02:00
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
Pierre Joye
cccc349aa5 - 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:30:35 +00:00
Pierre Joye
aa297b60a3 - zend_list_insert TSRMLS fix (thx tony for the headup) 2010-09-16 13:34:51 +00:00
Pierre Joye
1fe5265c3e - WS 2010-06-30 22:06:49 +00:00
Pierre Joye
425c528783 - WS 2010-06-30 22:06:49 +00:00
Pierre Joye
9c60bd8df7 - typo for iconv DLL .lib 2010-06-28 23:26:48 +00:00
Pierre Joye
f62f88cb76 - typo for iconv DLL .lib 2010-06-28 23:26:48 +00:00
Pierre Joye
c145a3754b - #52043,GD doesn't recognize latest libJPEG version 2010-06-14 08:12:10 +00:00
Pierre Joye
d652e02235 - #52043,GD doesn't recognize latest libJPEG version 2010-06-14 08:12:10 +00:00
Rasmus Lerdorf
5583cd237f Check for -1 as well here 2010-05-24 23:52:11 +00:00
Rasmus Lerdorf
a906125fec Check for -1 as well here 2010-05-24 23:52:11 +00:00
Rasmus Lerdorf
159369c68c Let's have a sane error message here instead of some cryptic zlib error 2010-05-24 23:27:39 +00:00
Rasmus Lerdorf
13a09194a9 Let's have a sane error message here instead of some cryptic zlib error 2010-05-24 23:27:39 +00:00
Pierre Joye
fa78b4497e - #51793, Add alpha argument to imagecolorset 2010-05-18 12:38:57 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Pierre Joye
0688e6ef01 - - Fixed #51128, imagefill() doesn't work with large images 2010-04-28 14:35:42 +00:00
Pierre Joye
ef76df031b - - Fixed #51128, imagefill() doesn't work with large images 2010-04-28 14:35:42 +00:00
Pierre Joye
07446082c8 - Fix #51671, imagefill does not work correctly for small images 2010-04-28 08:23:44 +00:00
Pierre Joye
c09a8cb043 - Fix #51671, imagefill does not work correctly for small images 2010-04-28 08:23:44 +00:00
Pierre Joye
eaab2fbc4b - WS 2010-04-28 08:04:52 +00:00
Pierre Joye
27d922c49f - WS 2010-04-28 08:04:52 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode 
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
 2010-04-26 23:53:30 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Takeshi Abe
42c14bf473 Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) 2010-03-24 04:12:19 +00:00
Takeshi Abe
a46e108b83 Fixed bug #51263 (imagettftext and rotated text uses wrong baseline) 2010-03-24 04:12:19 +00:00
Raphael Geissert
2c3b1fd920 Properly skip tests that require the bundled gd lib when the external is used 2010-03-11 05:49:50 +00:00
Takeshi Abe
bea0320749 fix libgd FS100 (spurious horizontal line drawn by gdImageFilledPolygon) 2010-01-20 09:39:06 +00:00
Takeshi Abe
e3e76d7baf fix wrong type and useless assignments 2010-01-15 17:09:14 +00:00
Takeshi Abe
f7a3b3f5aa imagepolygon() and imagefilledpolygon() does not allow negative number of points causing invalid allocation 2010-01-14 11:11:56 +00:00
Takeshi Abe
dd17af94c5 removed an unused variable 2010-01-13 06:55:03 +00:00
Pierre Joye
7aacc1ccbc - use png_sig_cmp to support libpng 1.4, old is deprecated already in older version 2010-01-10 02:13:45 +00:00