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
108,978 Commits 491 Branches 1,363 Tags 841 MiB
49944e4bcf
Commit Graph

108978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Jones
49944e4bcf Merge branch 'PHP-7.2' into PHP-7.3 2018-12-07 23:22:30 +11:00
Nikita Popov
e3946534a4 Drop unnecessary HASH_OF uses in ext/oci8 
These only operate on arrays.
 2018-12-07 23:21:32 +11:00
Christopher Jones
171389b435 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-07 23:20:27 +11:00
Christopher Jones
b797818e09 Simplify based on feedback from nikic 2018-12-07 23:07:37 +11:00
Christopher Jones
91776f7264 Sync with test files 2018-12-07 21:41:34 +11:00
Christoph M. Becker
327e2d0153 [ci skip] Fix NEWS wrt. ChangeLog conversion 
We have to be rather picky in this regard; otherwise we need to
manually post process the ChangeLog.
 2018-12-06 17:15:43 +01:00
Christoph M. Becker
43329e85e6 [ci skip] Fix typo 2018-12-06 00:24:25 +01:00
Ferenc Kovacs
c7095bd607 Merge branch 'PHP-7.2' into PHP-7.3 2018-12-05 09:44:22 +01:00
Ferenc Kovacs
bc32061dba Merge branch 'PHP-7.1' into PHP-7.2 2018-12-05 09:36:31 +01:00
Ferenc Kovacs
6cbdc5e207 Merge branch 'PHP-7.0' into PHP-7.1 2018-12-05 09:30:20 +01:00
Ferenc Kovacs
bd289af963 Merge branch 'PHP-5.6' into PHP-7.0 2018-12-05 09:25:53 +01:00
Ferenc Kovacs
c26cb383a5 5.6.40 will be next. probably not 2018-12-05 09:13:30 +01:00
Côme Chilliet
cb00ca7cfe Add LDAP information in UPGRADING 2018-12-04 17:15:55 +01:00
Anatol Belski
807d8aa00d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Sync NEWS [ci skip]
 2018-12-04 12:50:40 +01:00
Anatol Belski
6e9435f339 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync NEWS [ci skip]
 2018-12-04 12:50:04 +01:00
Anatol Belski
d07e63211a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Sync NEWS [ci skip]
 2018-12-04 12:49:42 +01:00
Anatol Belski
a8f125fbca Sync NEWS [ci skip] 2018-12-04 12:49:10 +01:00
Jakub Zelenka
6493d54897 Update UPGRADING with info about FPM logging changes 2018-12-03 18:30:41 +00:00
Stanislav Malyshev
36534afd10 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:20:07 -08:00
Stanislav Malyshev
a9ef7ecc60 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:20:02 -08:00
Stanislav Malyshev
d5dc3c69f9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:19:57 -08:00
Stanislav Malyshev
036bc5c1fb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix null pointer deref in qprint-encode filter (bug #77231)
 2018-12-03 10:19:49 -08:00
Stanislav Malyshev
78bffa72c1 Fix null pointer deref in qprint-encode filter (bug #77231) 2018-12-03 10:19:08 -08:00
Christoph M. Becker
5be58a437c [ci skip] Prepare NEWS for 7.3 GA 2018-12-03 13:56:14 +01:00
Stanislav Malyshev
3d8d13f7b9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77143 - add more checks to buffer reads
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail
  Don't need interactive progress on git clones in Travis
  Fix TSRM signature - php_stream_stat macro has it's own TSRM
  Regenerate certificates for openssl tests
  Improve test for bug77022
 2018-12-03 00:42:55 -08:00
Stanislav Malyshev
8fff90250b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77143 - add more checks to buffer reads
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail
 2018-12-03 00:42:50 -08:00
Stanislav Malyshev
8ab5d22332 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #77143 - add more checks to buffer reads
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail
 2018-12-03 00:42:45 -08:00
Stanislav Malyshev
5718d73dbb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #77143 - add more checks to buffer reads
 2018-12-03 00:42:35 -08:00
Stanislav Malyshev
48f0f73f75 Fix bug #77143 - add more checks to buffer reads 2018-12-03 00:41:46 -08:00
Stanislav Malyshev
66a0f061f6 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #77143 - add more checks to buffer reads
  Fix #77020: null pointer dereference in imap_mail
 2018-12-03 00:39:03 -08:00
Stanislav Malyshev
54212674b9 Fix bug #77143 - add more checks to buffer reads 2018-12-03 00:03:10 -08:00
Stanislav Malyshev
7edc639b9f Fix #77020: null pointer dereference in imap_mail 
If an empty $message is passed to imap_mail(), we must not set message
to NULL, since _php_imap_mail() is not supposed to handle NULL pointers
(opposed to pointers to NUL).
 2018-12-03 00:00:56 -08:00
Stanislav Malyshev
1f78b1dfd0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Don't need interactive progress on git clones in Travis
 2018-12-02 16:04:33 -08:00
Philip Prindeville
61af343768 Don't need interactive progress on git clones in Travis 
Travis logs are usually inspected after the build completes, by which time
progress info is useless.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
 2018-12-02 16:04:22 -08:00
Stanislav Malyshev
1225467d8a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix TSRM signature - php_stream_stat macro has it's own TSRM
  Regenerate certificates for openssl tests
  Improve test for bug77022
 2018-12-02 15:12:15 -08:00
Stanislav Malyshev
f8eac1f438 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix TSRM signature - php_stream_stat macro has it's own TSRM
  Regenerate certificates for openssl tests
  Improve test for bug77022
 2018-12-02 13:38:59 -08:00
Stanislav Malyshev
6e3f5d57d4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix TSRM signature - php_stream_stat macro has it's own TSRM
  Regenerate certificates for openssl tests
  Improve test for bug77022
 2018-12-02 13:18:07 -08:00
Stanislav Malyshev
aabdb71dc3 Fix TSRM signature - php_stream_stat macro has it's own TSRM 2018-12-02 12:54:19 -08:00
Alexander Kurilo
0382e761d7 Regenerate certificates for openssl tests 2018-12-02 12:08:19 -08:00
Stanislav Malyshev
2fba1e2f59 Improve test for bug77022 2018-12-02 12:06:13 -08:00
Jakub Zelenka
1deee2ba7c Merge branch 'PHP-7.2' into PHP-7.3 2018-12-02 19:38:38 +00:00
Alexander Kurilo
655fb96354 Regenerate certificates for openssl tests 2018-12-02 19:37:10 +00:00
Stanislav Malyshev
e614b12712 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
 2018-12-01 21:48:44 -08:00
Stanislav Malyshev
c5869fd1c8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
 2018-12-01 21:48:40 -08:00
Stanislav Malyshev
09885f78c6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
 2018-12-01 21:48:35 -08:00
Stanislav Malyshev
cea277048d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:48:27 -08:00
Stanislav Malyshev
cc84d893c7 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:47:49 -08:00
Stanislav Malyshev
8136d130b6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:47:44 -08:00
Stanislav Malyshev
1aec05defd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:47:37 -08:00
Stanislav Malyshev
67f3615102 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #77022 - use file mode or umask for new files
 2018-12-01 21:08:38 -08:00