php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,168 Commits 549 Branches 1,486 Tags
dfd776b32656e573bea6141d63df6f05a396e69f
Commit Graph

43497 Commits

Author SHA1 Message Date
Anatol Belski dfd776b326 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  enforce the test ini usage for the child process
 2016-12-04 14:02:37 +01:00
Anatol Belski 10a2ceef3b enforce the test ini usage for the child process 2016-12-04 14:01:40 +01:00
Anatol Belski 1c2333009f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fork tests
 2016-12-01 14:53:22 +01:00
Anatol Belski 2252d4e59d fork tests 2016-12-01 14:52:18 +01:00
Dmitry Stogov 96655ad01e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bad merge
 2016-12-01 16:22:23 +03:00
Dmitry Stogov 7f22e3c879 Fixed bad merge 2016-12-01 16:21:57 +03:00
Dmitry Stogov d149ba217f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:50:19 +03:00
Dmitry Stogov b7b7dd8cea Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Workaround for GCC-4.9.2 bug
  oops, changed in wrong place
 2016-12-01 15:50:05 +03:00
Anatol Belski 9c7540d357 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve skipif
 2016-12-01 13:33:42 +01:00
Anatol Belski 615c9bfe5a fix condition 2016-12-01 13:33:27 +01:00
Anatol Belski 043d8e2fe1 improve skipif 2016-12-01 13:32:10 +01:00
Anatol Belski 8ecbb660d0 improve skipif 2016-12-01 13:25:28 +01:00
Dmitry Stogov 54244ba565 Fixed access to uninitialized value 2016-12-01 13:25:50 +03:00
Dmitry Stogov 54f7abfe7d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Simpler overflow check
  fix gcov coverage
 2016-12-01 10:34:09 +03:00
Dmitry Stogov 003346c450 Simpler overflow check 2016-12-01 10:30:02 +03:00
Anatol Belski 60c875b072 fix dir separator 2016-12-01 01:36:29 +01:00
Nuno Lopes d5a2af6d1c Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0 2016-11-30 14:41:26 -05:00
Dmitry Stogov cabcf8971f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
 2016-11-28 12:57:02 +03:00
Dmitry Stogov 9a9ad56af0 Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on). 2016-11-28 12:54:47 +03:00
Stanislav Malyshev c8778eb293 oops, changed in wrong place 2016-11-27 16:11:41 -08:00
Stanislav Malyshev 53655c5af1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add NEWS
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:38:33 -08:00
Stanislav Malyshev f1a9851c3e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:36:29 -08:00
Stanislav Malyshev 8856b3a63c Merge branch 'pull-request/1974' into PHP-5.6 
* pull-request/1974:
  Fix #68447: grapheme_extract take an extra trailing character
 2016-11-27 15:34:58 -08:00
Stanislav Malyshev 8cc42537d2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73549: Use after free when stream is passed to imagepng
 2016-11-27 14:53:39 -08:00
Stanislav Malyshev 1cb58ead70 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #73549: Use after free when stream is passed to imagepng
 2016-11-27 14:53:27 -08:00
Christoph M. Becker 5049ef2f1c Fix #73549: Use after free when stream is passed to imagepng 
If a stream is passed to imagepng() or other image output functions,
opposed to a filename, we must not close this stream.
 2016-11-27 14:51:02 -08:00
Jakub Zelenka 0ebdf3625e Do not add extra timeval entropy when OpenSSL 1.1 used 
It is already added by OpenSSL so it is not needed
 2016-11-27 19:00:05 +00:00
Jakub Zelenka 0f4216298f Clean up and fix php_openssl_dh_pub_from_priv 2016-11-27 18:54:28 +00:00
Matteo Beccati 461add8adf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix occasionaly failing test
 2016-11-27 10:20:50 +01:00
Matteo Beccati 54c04befc2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix occasionaly failing test
 2016-11-27 10:20:38 +01:00
Matteo Beccati 2a80758fd5 Fix occasionaly failing test 2016-11-27 10:20:13 +01:00
Stanislav Malyshev bc85678df3 Add more mbfl string size checks (bug #73505) 2016-11-26 14:49:48 -08:00
Stanislav Malyshev dd7eee0609 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add more mbfl string size checks (bug #73505)
 2016-11-26 14:48:50 -08:00
Stanislav Malyshev 58cdd03d92 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add more mbfl string size checks (bug #73505)
 2016-11-26 14:48:40 -08:00
Stanislav Malyshev 5ee02b207d Add more mbfl string size checks (bug #73505) 2016-11-26 14:47:58 -08:00
Christoph M. Becker 09085ac02c Merge branch 'PHP-7.0' into PHP-7.1 2016-11-26 16:09:45 +01:00
Christoph M. Becker 003727d851 Fix #73612: preg_*() may leak memory 
We have to make sure that collectible zvals end up in the GC root
buffer, to avoid memory leaks.
 2016-11-26 15:34:27 +01:00
Stanislav Malyshev f9a80a0a29 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix more size_t/int implicit conversions
 2016-11-25 15:32:59 -08:00
Stanislav Malyshev 8be94d46f8 Fix more size_t/int implicit conversions 
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
 2016-11-25 15:31:50 -08:00
Stanislav Malyshev bcc913fa8b Fix int/size_t confusion in isValidPharFilename (bug #73580) 2016-11-25 15:31:50 -08:00
Stanislav Malyshev ffb65ba833 Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:php-src:
  Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt
 2016-11-25 15:31:22 -08:00
Stanislav Malyshev 7010547c4e Fix more size_t/int implicit conversions 
Now the conversions are explicit and do checks. Not sure it's
the best way but at least we can see them now in the open.
 2016-11-25 15:30:20 -08:00
Christoph M. Becker 51ba53ed0f Merge branch 'PHP-7.0' into PHP-7.1 2016-11-25 23:27:13 +01:00
Christoph M. Becker bc979aee6d Merge branch 'PHP-5.6' into PHP-7.0 2016-11-25 23:16:18 +01:00
Christoph M. Becker 7f529e3dee Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt 
This test is not supposed to work with JIS-mapped Japanese font support
enabled.
 2016-11-25 23:14:08 +01:00
Stanislav Malyshev 2cc3df3252 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix int/size_t confusion in isValidPharFilename (bug #73580)
 2016-11-25 13:43:59 -08:00
Stanislav Malyshev cb6bcaa61f Fix int/size_t confusion in isValidPharFilename (bug #73580) 2016-11-25 13:42:35 -08:00
Anatol Belski c26e96a05d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  add test for bug #57547
 2016-11-24 19:27:50 +01:00
Anatol Belski a36dd1dfd8 add test for bug #57547 2016-11-24 19:25:47 +01:00
Derick Rethans ec366eac5f Updated to version 2016.10 (2016j) 2016-11-24 10:40:15 +00:00