clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
103,563 Commits 494 Branches 1,367 Tags 785 MiB
3f45262aa9
Commit Graph

103563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frank Denis
3f45262aa9 Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2 
* 'PHP-7.2' of git.php.net:php-src:
  It's `--SKIPIF--`, not `--SKIP--`
 2017-07-30 14:48:44 +02:00
Frank Denis
85895b2e5b sodium ext: no need for #ifdef crypto_aead_chacha20poly1305_IETF_NPUBBYTES 
chacha20poly1305_ietf was implemented in libsodium 1.0.4 which is way earlier
than the minimum version we support.
 2017-07-30 14:47:49 +02:00
Frank Denis
1d7e1f845f sodium ext: check that message sizes are safe, to avoid hitting abort() in libsodium 2017-07-30 14:45:06 +02:00
Frank Denis
ae99959986 sodium ext: use unexpand -t 4 --first-only to convert from spaces to tabs 
No actual code changes.

Fun fact: macOS' unexpand(1) tool doesn't work as documented, and always
converts everything to tabs, regardless of the -a switch.
 2017-07-30 14:34:55 +02:00
Christoph M. Becker
782f45c8e6 It's --SKIPIF--, not --SKIP-- 2017-07-30 14:01:51 +02:00
Christoph M. Becker
71e47c5c13 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip this test if ext/gd is not available
 2017-07-30 13:37:36 +02:00
Christoph M. Becker
f213ee5952 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip this test if ext/gd is not available
 2017-07-30 13:30:18 +02:00
Christoph M. Becker
4d6f808c16 Skip this test if ext/gd is not available 2017-07-30 13:24:10 +02:00
Frank Denis
613c8dd7b0 sodium ext: let crypto_pwhash() accept an optional algorithm identifier 2017-07-29 13:04:54 +02:00
Nikita Popov
5d777e56e2 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-28 13:03:26 +02:00
Nikita Popov
c48c638aeb Merge branch 'PHP-7.0' into PHP-7.1 2017-07-28 13:03:02 +02:00
Nikita Popov
e3d25e78eb Fixed bug #62934 2017-07-28 13:02:25 +02:00
Anatol Belski
80d839d25a add missing makefile fragment for .w32 
ensure correct dir
 2017-07-28 07:26:11 +02:00
Anatol Belski
2ae0dd7f61 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  relax test on travis
 2017-07-28 00:28:12 +02:00
Anatol Belski
55e7459cea Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  relax test on travis
 2017-07-28 00:27:52 +02:00
Anatol Belski
b01336814d relax test on travis 2017-07-28 00:27:11 +02:00
Sara Golemon
4a6ef8327a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Simpler fix for #74974
 2017-07-27 10:04:59 -04:00
Sara Golemon
b62fb3aa0c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Simpler fix for #74974
 2017-07-27 10:04:14 -04:00
Pedro Magalhães
34e5d3a87d Simpler fix for #74974 2017-07-27 09:25:38 -04:00
Xinchen Hui
262aeb8ae1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed test
 2017-07-27 12:50:41 +08:00
Xinchen Hui
0ddda0dcb7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-07-27 12:50:28 +08:00
Xinchen Hui
9fcfe52d03 Fixed test 2017-07-27 12:50:17 +08:00
Xinchen Hui
afc2be8fc8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74949 (null pointer dereference in _function_string)
 2017-07-27 11:24:53 +08:00
Xinchen Hui
f894bb750c Update NEWS 2017-07-27 11:24:26 +08:00
Xinchen Hui
efb1be547c Update NEWS 2017-07-27 11:23:52 +08:00
Xinchen Hui
84a18c4782 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74949 (null pointer dereference in _function_string)
 2017-07-27 11:23:27 +08:00
Xinchen Hui
e36c04ef48 Fixed bug #74949 (null pointer dereference in _function_string) 2017-07-27 11:23:06 +08:00
Sara Golemon
08fef4cc23 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
 2017-07-26 18:56:06 -04:00
Sara Golemon
80f4297c25 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods
 2017-07-26 18:55:46 -04:00
Sara Golemon
c7aa8ba0ee
Bugfix #74993 Wrong reflection param into for some intl: lookup_*() methods 2017-07-26 18:55:23 -04:00
Anatol Belski
57c435e5ac [ci skip] update NEWS 2017-07-26 17:31:57 +02:00
Anatol Belski
2d8fe973b1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] update NEWS
  [ci skip] update NEWS
 2017-07-26 17:31:10 +02:00
Anatol Belski
4cde48bb73 [ci skip] update NEWS 2017-07-26 17:30:40 +02:00
Anatol Belski
3f9e8e6686 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-07-26 17:30:02 +02:00
Anatol Belski
3306b3aa60 [ci skip] update NEWS 2017-07-26 17:29:37 +02:00
Anatol Belski
9ff4801159 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74833, SID constant created with wrong module number
 2017-07-26 13:21:20 +02:00
Anatol Belski
eaf5c7cdd4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74833, SID constant created with wrong module number
 2017-07-26 13:20:48 +02:00
Anatol Belski
bd00fe81cc Fixed bug #74833, SID constant created with wrong module number 2017-07-26 13:19:41 +02:00
Joe Watkins
d3060a00d1
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases
 2017-07-26 10:47:49 +01:00
Joe Watkins
bb9ea4e88b
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases
 2017-07-26 10:47:22 +01:00
Benjamin W. Broersma
6b1fbafdf0
Fix bug #74991 - include_path has a 4096 char (minus "__DIR__:") limit, in some PHAR cases 2017-07-26 10:46:50 +01:00
Christopher Jones
787ea0dda5 Update NEWS 2017-07-26 15:25:01 +10:00
Christopher Jones
664eca5967 Merge branch 'PHP-7.1' into PHP-7.2 2017-07-26 15:24:26 +10:00
Christopher Jones
747f5b23ae Update NEWS 2017-07-26 15:23:58 +10:00
Christopher Jones
46a6ae0d45 Merge branch 'PHP-7.0' into PHP-7.1 2017-07-26 15:23:17 +10:00
Christopher Jones
de65a2243f Expose oci_unregister_taf_callback() 2017-07-26 15:22:44 +10:00
Xinchen Hui
53e59e4b34 Update NEWS 2017-07-26 12:07:20 +08:00
Xinchen Hui
0e61cddeb1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74980 (Narrowing occurred during type inference)
 2017-07-26 12:06:55 +08:00
Xinchen Hui
3df47c12f7 Fixed bug #74980 (Narrowing occurred during type inference) 2017-07-26 12:06:33 +08:00
Aleš Rebec
f469edcf59
Remove obsolete function names from CODING_STANDARDS file 
Deprecated and removed function names used as examples in coding standards file.

- Mcrypt is deprecated and will be removed in 7.2
- Mysql functions are deprecated in 5.4 and removed in 7.0.

According to those changes, CODING_STANDARDS file should be updated.
 2017-07-25 07:04:23 +01:00