mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-26 02:10:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
106,132 Commits 503 Branches 1,387 Tags 774 MiB
4959ceb537
Commit Graph

106132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lior Kaplan
4959ceb537 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Happy new year (Update copyright to 2018)
 2018-01-04 00:58:17 +02:00
Lior Kaplan
fc528afd2b Happy new year (Update copyright to 2018) 2018-01-04 00:50:42 +02:00
Anatol Belski
f9072ac62a Revert "Enable ODBC tests on AppVeyor" 
This reverts commit b0db19e223.

More test fixes needed to evaluate.
 2018-01-03 21:05:56 +01:00
Anatol Belski
b0db19e223 Enable ODBC tests on AppVeyor 2018-01-03 20:28:16 +01:00
Anatol Belski
f4076bb1b3 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Skip on Travis-CI
 2018-01-03 18:36:34 +01:00
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
5361bf3312 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Extend skip section
 2018-01-03 16:56:42 +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
f70570938d Merge branch 'PHP-7.2' 
* PHP-7.2:
  2018
 2018-01-03 15:13:18 +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
4b95341ba2 Merge branch 'PHP-7.2' 
* PHP-7.2:
  missing changelog entries + fix version and date
  missing changelog entries
  2018
 2018-01-03 15:10:25 +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
Gabriel Caruso
6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui
a76eeea736 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE
 2018-01-03 16:02:15 +08: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
76dd9a5572 Merge branch 'PHP-7.2' 2018-01-03 00:36:55 +01: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
dd0ebc02dc Merge branch 'PHP-7.2' 
* PHP-7.2:
  Skip test for pdo_odbc
 2018-01-02 12:29:43 +01: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
53b79dfe09 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix test for pdo_odbc
 2018-01-02 11:39:36 +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
77298dee2e Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix some int/long confusion issues in GMP
 2018-01-02 00:12:43 -08: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
eb65916f7f Merge branch 'PHP-7.2' 
* PHP-7.2:
  [ci skip] update NEWS
 2018-01-02 07:50:57 +01: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
a307689ba7 Remove unnecessary initialization:w 2018-01-02 14:03:34 +08:00
Xinchen Hui
6cf9c91b55 Merge branch 'PHP-7.2' 
* PHP-7.2:
  regenerated with newer re2c
 2018-01-02 13:59:07 +08: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
a7fe2570d3 Merge branch 'master' of git.php.net:/php-src 
* 'master' 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:40 +08:00