Commit Graph

109272 Commits

Author SHA1 Message Date
Nikita Popov
f48ee1ff58 Clarify that the get_properties handler is required
Some places were checking for non-null get_properties, some weren't.
Make it clear that the handler is required and such checks are not
necessary.
2018-10-04 12:46:50 +02:00
Nikita Popov
74d138e4a3 Fix incorrect printf modifier after size_t changes 2018-10-04 12:13:46 +02:00
Remi Collet
1ac97c77cb Merge branch 'PHP-7.3'
* PHP-7.3:
  Allow to disable pcre.jit when system library is used as it is for now broken on some arch (s390x...)
2018-10-04 11:46:37 +02:00
Remi Collet
bbfea4b470 Allow to disable pcre.jit when system library is used
as it is for now broken on some arch (s390x...)
2018-10-04 11:45:35 +02:00
Pierrick Charron
69d31f167c Merge branch 'PHP-7.3' 2018-10-03 21:19:05 -04:00
Pierrick Charron
2e984dc726 Update NEWS [ci skip] 2018-10-03 21:18:47 -04:00
Pierrick Charron
e450679dcd Merge branch 'PHP-7.3' 2018-10-03 19:44:46 -04:00
Pierrick Charron
02b2dbb724 Add constants from curl 7.50 to 7.55 2018-10-03 19:43:59 -04:00
Christoph M. Becker
0489b865bf Fix PRIMARY MAINTAINER and MAINTENANCE fields
We have to distinguish between `PRIMARY_MAINTAINER` and `MAINTENANCE`.
Furthermore, all extensions should have both fields.
2018-10-04 00:47:52 +02:00
Christoph M. Becker
60f284c8c6 Merge branch 'PHP-7.3'
* PHP-7.3:
  libzip has been unbundled in master only
2018-10-04 00:30:40 +02:00
Christoph M. Becker
6af14492a5 libzip has been unbundled in master only
Cf. <https://github.com/php/php-src/pull/3532>.
2018-10-04 00:30:10 +02:00
Anatol Belski
248c857a31 Reuse delivered length
Fix length calculation
2018-10-03 23:12:49 +02:00
Anatol Belski
14628f1c5d Add compatibility bit
readlink in PHP doesn't error on regular files.
2018-10-03 21:17:52 +02:00
Dmitry Stogov
2ebac3263b Removed wrong reference counting 2018-10-03 20:15:30 +03:00
Anatol Belski
969fdb717a Update UPGRADING [ci skip] 2018-10-03 19:11:31 +02:00
Anatol Belski
91c905e83c Refactor php_sys_readlink
Also move the implementation into win32 where it belongs
2018-10-03 18:56:55 +02:00
Anatol Belski
97481fccb9 Merge branch 'PHP-7.3'
* PHP-7.3:
  Update NEWS [ci skip]
2018-10-03 18:54:47 +02:00
Anatol Belski
38c060852e Update NEWS [ci skip] 2018-10-03 18:54:08 +02:00
Anatol Belski
cd441e2131 Merge branch 'PHP-7.3'
* PHP-7.3:
  Update NEWS [ci skip]
  Update NEWS [ci skip]
  Update NEWS [ci skip]
2018-10-03 18:52:21 +02:00
Anatol Belski
0c99755c3c Update NEWS [ci skip] 2018-10-03 18:51:48 +02:00
Anatol Belski
3424cc1e8e Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update NEWS [ci skip]
  Update NEWS [ci skip]
2018-10-03 18:50:24 +02:00
Anatol Belski
42b769b9e2 Update NEWS [ci skip] 2018-10-03 18:49:52 +02:00
Anatol Belski
31a293f885 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update NEWS [ci skip]
2018-10-03 18:49:13 +02:00
Anatol Belski
abfda3de99 Update NEWS [ci skip] 2018-10-03 18:48:40 +02:00
Dmitry Stogov
60591328f8 More careful handling of function prototypes 2018-10-03 18:32:25 +03:00
Dmitry Stogov
ba3d0a845a Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Avoid code duplication and don't miss env restore
2018-10-03 17:43:08 +03:00
Anatol Belski
1c11fc7f13 Merge branch 'PHP-7.3'
* PHP-7.3:
  Avoid code duplication and don't miss env restore
2018-10-03 14:36:09 +02:00
Anatol Belski
8400f73f8d Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Avoid code duplication and don't miss env restore
2018-10-03 14:35:38 +02:00
Anatol Belski
b8cfa09657 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Avoid code duplication and don't miss env restore
2018-10-03 14:34:08 +02:00
Anatol Belski
044eb39e63 Avoid code duplication and don't miss env restore 2018-10-03 14:32:52 +02:00
Dmitry Stogov
ed5fb80c31 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Hopefully last round of size_t fixes, this makes the remaining php_hash_ops use size_t over an int
2018-10-03 15:01:53 +03:00
Kalle Sommer Nielsen
d604f65de5 Merge branch 'master' of git.php.net:/php-src 2018-10-03 13:36:30 +02:00
Kalle Sommer Nielsen
5268f367ce Hopefully last round of size_t fixes, this makes the remaining php_hash_ops use size_t over an int 2018-10-03 13:36:05 +02:00
Dmitry Stogov
b9e485a7fd typo 2018-10-03 14:35:36 +03:00
Remi Collet
4778578b56 Merge branch 'PHP-7.3'
* PHP-7.3:
  bump zip extension version
2018-10-03 12:59:46 +02:00
Remi Collet
726a77cfdd Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  bump zip extension version
2018-10-03 12:59:31 +02:00
Remi Collet
da05b7e81e bump zip extension version 2018-10-03 12:59:01 +02:00
Anatol Belski
3ad2ab6e7d Merge branch 'PHP-7.3'
* PHP-7.3:
  Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:15:54 +02:00
Anatol Belski
46bc0940e7 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:15:15 +02:00
Anatol Belski
dc48e01a19 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fixed bug #76948 Failed shutdown/reboot or end session in Windows
2018-10-03 12:13:22 +02:00
Anatol Belski
b0547a3dfb Fixed bug #76948 Failed shutdown/reboot or end session in Windows 2018-10-03 12:11:43 +02:00
Kalle Sommer Nielsen
b1f6390f16 Merge branch 'master' of git.php.net:/php-src 2018-10-03 11:36:30 +02:00
Kalle Sommer Nielsen
c116326793 Remove $ext_shared usage for ext/hash in the Unix build script (Thanks Christoph for the notice) 2018-10-03 11:36:11 +02:00
Dmitry Stogov
afcc785399 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Second round of fixing compiler warnings in ext/hash. Lots of the signatures that previously was unsigned int is now size_t, there was a fair bit of inconsistency there already and this commit should make it all sync nicely
  Write to correct smart_str
  Revert "Fix compiler warnings in ext/hash"
2018-10-03 12:33:36 +03:00
Kalle Sommer Nielsen
0d7d2a2011 Merge branch 'master' of git.php.net:/php-src 2018-10-03 11:33:15 +02:00
Kalle Sommer Nielsen
84b0d0faba Second round of fixing compiler warnings in ext/hash. Lots of the signatures that previously was unsigned int is now size_t, there was a fair bit of inconsistency there already and this commit should make it all sync nicely 2018-10-03 11:32:57 +02:00
Dmitry Stogov
c88b53318f Avoid method compatibility check with itself 2018-10-03 12:32:33 +03:00
Dmitry Stogov
9418144054 Added assertions 2018-10-03 12:31:47 +03:00
Nikita Popov
1e14b7a369 Write to correct smart_str
Mixed this up during the migration to ZEND_HASH_FOREACH.
2018-10-03 11:03:55 +02:00
Nikita Popov
a659d16adf Merge branch 'PHP-7.3' 2018-10-03 10:50:38 +02:00