clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,699 Commits 494 Branches 1,367 Tags 786 MiB
167979fe76
Commit Graph

1325 Commits

Author SHA1 Message Date
Dmitry Stogov
2fa8d67a5c Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
Anatol Belski
4a1e4e2870 fix unitialized val usage 2015-02-04 18:13:28 +01:00
Xinchen Hui
942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
Rasmus Lerdorf
f9664ce853 PHP7 API updates 2015-01-20 23:40:33 -08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Stanislav Malyshev
75e042e57a Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix GD tests with no GD loaded
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:57:46 -08:00
Stanislav Malyshev
97f894e189 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix GD tests with no GD loaded
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:57:29 -08:00
Stanislav Malyshev
5639c3350e Merge branch 'pull-request/742' into PHP-5.5 
* pull-request/742:
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:47:54 -08:00
Stanislav Malyshev
75f93ed663 fix GD tests with no GD loaded 2015-01-04 19:45:57 -08:00
Remi Collet
df4aaa81ef Fix Bug #68713 infinite loop / infinite free 
PHP not affected (emalloc never return NULL)
Just to reduce diff with upstream and for legibility

Apply:
3c0d2203b2
4af76c97a4
 2015-01-03 08:34:27 +01:00
Remi Collet
af11f818fb Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68656 Report gd library version
 2014-12-26 08:35:31 +01:00
Remi Collet
faba230153 Fix bug #68656 Report gd library version 2014-12-26 08:33:21 +01:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Anatol Belski
9c354ba182 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Better fix for #68601 for perf 81e9a993f2
  Added EXPECTED(). Most functions have arguments.
 2014-12-17 11:53:45 +01:00
Remi Collet
f61071205f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for #68601 for perf 81e9a993f2
 2014-12-17 11:01:23 +01:00
Remi Collet
f382fbf4c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for #68601 for perf 81e9a993f2
 2014-12-17 11:00:52 +01:00
Remi Collet
5fc2fede9c Better fix for #68601 for perf 
81e9a993f2
 2014-12-17 10:59:36 +01:00
Anatol Belski
4acc56d5b2 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fix unserializer patch
  move this entry to the correct version
  add missing NEWS entry
  add missing NEWS entry
  Updated or skipped certain 32-bit tests
  add NEWS entry for #68594
  5.4.37
  add more BC breaks
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
  Fix typo
  Hash value must not zero?
 2014-12-17 05:29:36 +01:00
Andrea Faulds
1392102b0c Updated or skipped certain 32-bit tests 2014-12-17 01:06:48 +00:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Andrea Faulds
0ea0b591d7 Merge branch 'zppFailOnOverflow' 
* zppFailOnOverflow:
  Fix MySQLi tests
  Fixed gd test
  Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG()
  Fixed copy-and-paste error
  Fix more 32-bit tests
  Skip buncha tests on 32-bit
  skip simplexml
  skip posix 32-bit
  skip tests on 32-bit
  Fixes simplexml test
  Fixes posix tests
  Fixes iconv tests
  Marked tests as 32-bit
  Fixed more 32-bit tests
  Fixed some 32-bit tests
  Mark said ext/date tests as 32-bit only
  Fixed ext/date tests broken by zpp error on overflow
  Fixed broken tests
  Make zpp fail if NaN passed for int, or out-of-range float for non-capping int

Conflicts:
	ext/date/tests/getdate_variation7.phpt
	ext/date/tests/localtime_variation3.phpt
 2014-12-13 18:38:15 +00:00
Remi Collet
de0afce55b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68601 buffer read overflow in gd_gif_in.c
 2014-12-13 09:06:24 +01:00
Remi Collet
8bd67ce748 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug #68601 buffer read overflow in gd_gif_in.c
 2014-12-13 09:05:33 +01:00
Remi Collet
07b5896a13 Fix bug #68601 buffer read overflow in gd_gif_in.c 2014-12-13 09:03:44 +01:00
Andrea Faulds
175844ca29 Fixed gd test 2014-11-29 02:58:41 +00:00
Stanislav Malyshev
d7808ddae4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  move tests into proper place
 2014-11-24 12:27:04 -08:00
Stanislav Malyshev
faa396c67d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  move tests into proper place
 2014-11-24 12:26:50 -08:00
Stanislav Malyshev
f86aa349eb move tests into proper place 2014-11-24 12:26:20 -08:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Anatol Belski
af7e3064f3 rename intel toolset to icc - shorter 2014-11-07 19:24:17 +01:00
Anatol Belski
7d7182e1b0 fix gd compilation with icc toolset 2014-11-07 19:13:41 +01:00
Ferenc Kovacs
c03b6e1701 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"
 2014-10-15 19:43:30 +02:00
Ferenc Kovacs
cfa1028d7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #65171 imagescale() fails
  Revert "Bug #41631: Observe socket read timeouts in SSL streams"

Conflicts:
	ext/openssl/xp_ssl.c
 2014-10-15 19:42:51 +02:00
Remi Collet
2728e6f017 Fixed Bug #65171 imagescale() fails 
Third param (height) is set as optional,
but default value = -1 is incorrect

Compute correct height to preserve ratio.
 2014-10-15 19:13:25 +02:00
Nikita Popov
7c5da4607c Fix casts in GD 
Using convert_to_* after ZVAL_COPY is unsafe.
 2014-10-10 12:23:33 +02:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910 
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
 2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Matteo Beccati
2508ce7aef Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed freetype test on multiple environments
 2014-09-16 10:23:03 +02:00
Matteo Beccati
24ed330a22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:49 +02:00
Matteo Beccati
b8470e19e4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a Fixed freetype test on multiple environments 
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)

This reverts commit 592df89027.
 2014-09-16 10:19:29 +02:00
Matteo Beccati
d1b0066df7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:45:17 +02:00
Matteo Beccati
627704b38e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test with freetype >= 2.4.12
 2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027 Fixed test with freetype >= 2.4.12 2014-09-03 09:43:29 +02:00
Anatol Belski
451856420c data type fixes 2014-08-29 12:53:37 +02:00