clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,879 Commits 491 Branches 1,363 Tags 841 MiB
1391a0fa0b
Commit Graph

104879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
4635cc5b9d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip on Travis-CI
 2018-01-03 18:36:10 +01:00
Anatol Belski
904e0d7212 Skip on Travis-CI 
The current doc states max ram for a test VM would be 7.5G, the
currently used container image has even less. This skip should be
revisited, as the available memory amount shifts. The way of checking
/proc/meminfo doesn't work reliably on containers at least, thus
skipping explicitly on Travis-CI makes sense.
 2018-01-03 18:32:33 +01:00
Anatol Belski
e282e52967 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Extend skip section
 2018-01-03 16:56:00 +01:00
Anatol Belski
2508d5051f Extend skip section 
The test requires some untrivial amount of RAM. Added a simple check for
the system free RAM to avoid false positive fails.
 2018-01-03 16:54:14 +01:00
Remi Collet
c0862892ff Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  2018
 2018-01-03 15:13:10 +01:00
Remi Collet
ce0ab999e5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  2018
 2018-01-03 15:13:03 +01:00
Remi Collet
27347613fe Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  2018
 2018-01-03 15:12:56 +01:00
Remi Collet
67ec3ce1ec 2018 2018-01-03 15:12:39 +01:00
Remi Collet
421787db6b missing changelog entries + fix version and date 2018-01-03 15:10:09 +01:00
Remi Collet
6659689c74 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  missing changelog entries
  2018
 2018-01-03 15:07:36 +01:00
Remi Collet
618c3b765d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  2018
 2018-01-03 15:07:18 +01:00
Remi Collet
d6e4132ca6 missing changelog entries 2018-01-03 15:07:09 +01:00
Remi Collet
1aa8e42036 2018 2018-01-03 15:04:48 +01:00
Xinchen Hui
0e62639d28 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Happy new year (Update copyright to 2018)
 2018-01-03 16:00:34 +08:00
Xinchen Hui
471aa5d50d Merge branch 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src into PHP-7.1 
* 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src:
  Happy new year (Update copyright to 2018)
 2018-01-03 15:59:05 +08:00
Ferenc Kovacs
5275149e3a Merge branch 'PHP-7.1' into PHP-7.2 2018-01-03 00:35:50 +01:00
Ferenc Kovacs
ca2619ff9a Merge branch 'PHP-7.0' into PHP-7.1 2018-01-03 00:34:24 +01:00
Ferenc Kovacs
4888495178 Merge branch 'PHP-5.6' into PHP-7.0 2018-01-03 00:33:20 +01:00
Ferenc Kovacs
028507f1f6 php 5.6.34 is next 2018-01-03 00:30:58 +01:00
Lior Kaplan
fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Anatol Belski
8a8bf1dc13 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip test for pdo_odbc
 2018-01-02 12:29:19 +01:00
Anatol Belski
463fd04758 Skip test for pdo_odbc 
The error messages are too discrepant and '-' is otherwise not allowed
by the parser.
 2018-01-02 12:12:46 +01:00
Anatol Belski
08d06f7d4f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test for pdo_odbc
 2018-01-02 11:39:09 +01:00
Anatol Belski
1a9d09784e Fix test for pdo_odbc 
SqlServer requires parentheses to the TOP argument.
 2018-01-02 11:34:57 +01:00
Stanislav Malyshev
4380ba7f9c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix some int/long confusion issues in GMP
 2018-01-02 00:12:33 -08:00
Stanislav Malyshev
c0f0a0a862 Fix some int/long confusion issues in GMP 
mpz_setbit seems to have limit of INT_MAX * GMP_NUMB_BITS on
the number of bits supported, and will abort() if that limit
is exceeded.
 2018-01-02 00:12:24 -08:00
Anatol Belski
e07eda1235 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] update NEWS
 2018-01-02 07:50:18 +01:00
Anatol Belski
2f56142034 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2018-01-02 07:49:53 +01:00
Anatol Belski
5d8e298ebf [ci skip] update NEWS 2018-01-02 07:49:09 +01:00
Xinchen Hui
b2346a9888 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  regenerated with newer re2c
 2018-01-02 13:57:56 +08:00
Xinchen Hui
b65abecfdf regenerated with newer re2c 2018-01-02 13:54:29 +08:00
Xinchen Hui
0ebe87dc17 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
 2018-01-02 13:50:46 +08:00
Xinchen Hui
e8eb52dc98 Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2 
* 'PHP-7.2' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-02 13:50:18 +08:00
Xinchen Hui
bd23bcec3e Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-02 13:49:58 +08:00
Stanislav Malyshev
a68dc899bb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-01 21:07:21 -08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
1f2ea6c59a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  year++
 2018-01-02 12:54:07 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Stanislav Malyshev
92c19f8a26 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-01 20:52:34 -08:00
Stanislav Malyshev
459ab2eef4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-01 20:28:01 -08:00
Stanislav Malyshev
2881199c80 Update NEWS 2018-01-01 19:53:00 -08:00
Christoph M. Becker
8d6e958867 Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx 
Due to a signedness confusion in `GetCode_` a corrupt GIF file can
trigger an infinite loop.  Furthermore we make sure that a GIF without
any palette entries is treated as invalid *after* open palette entries
have been removed.
 2018-01-01 19:51:26 -08:00
Stanislav Malyshev
73ca9b3773 Fix bug #74782: remove file name from output to avoid XSS 2018-01-01 19:51:02 -08:00
Nikita Popov
4422f86fde Merge branch 'PHP-7.1' into PHP-7.2 2018-01-01 21:30:30 +01:00
Nikita Popov
d534d59bd8 Fixed bug #75502 
The string keys were not duplicated into persistent memory in this
case.
 2018-01-01 21:29:24 +01:00
Jakub Zelenka
84aad458ca Merge branch 'PHP-7.1' into PHP-7.2 2017-12-30 17:41:45 +00:00
Jakub Zelenka
2fd0b994dd Use seialize_precision instead of precision in all json tests 2017-12-30 17:34:01 +00:00
Dmitry Stogov
9188f1d861 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75720 (File cache not populated after SHM runs full)
 2017-12-28 14:08:38 +03:00
Dmitry Stogov
60b2d67828 Fixed bug #75720 (File cache not populated after SHM runs full) 2017-12-28 14:08:12 +03:00
Xinchen Hui
650264e360 Fixed bug #75742 (potential memleak in internal classes's static members) 2017-12-28 16:31:09 +08:00