clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
105,068 Commits 491 Branches 1,363 Tags 839 MiB
84881c654e
Commit Graph

46796 Commits

Author SHA1 Message Date
David Zuelke
8000334538
Fixed bug #49876 lib path on 64bit distros 2018-02-08 10:41:46 +01:00
Bishop Bettini
d806d0315f
Fixed bug #65414 2018-02-08 10:32:08 +01:00
Bishop Bettini
4765ba7dc3
Fixed bug #65414 2018-02-08 10:29:56 +01:00
Joe
ab770401e1
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #74519 strange behavior of AppendIterator
 2018-02-08 10:18:31 +01:00
CHU Zhaowei
01eafceea1
Fixed bug #74519 strange behavior of AppendIterator 2018-02-08 10:16:24 +01:00
CHU Zhaowei
495508eceb
fix #74519 strange behavior of AppendIterator 2018-02-08 10:15:09 +01:00
Nikita Popov
1391a0fa0b Fixed bug #75893 
It is not sufficient to just add the additional types for aliased
variables at the end of type inference, because types of derived
variables may depend on them. Make sure the additional types are
always added whenever the type of an aliased variable is updated.
 2018-02-05 21:41:44 +01:00
Nikita Popov
d9e71169e6 Fixed bug #75729 
Don't try to evaluate substr() and strpos() at compile-time if
mbstring function overloading is enabled. I'm reusing the
COMPILE_NO_BUILTIN_STRLEN for the detection of mbstring function
overloading here, even if it's technically only about strlen()...
 2018-02-05 21:08:18 +01:00
Michael Wallner
3ef3f74a65
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix bug #75916 DNS_CAA record results contain garbage
 2018-02-05 09:08:12 +01:00
Michael Wallner
42f2ae0572
fix bug #75916 DNS_CAA record results contain garbage 
It is assumed that DNS_CAA record values are zero terminated,
while its length is defined as (RDATA_LENGTH - tag_length - 2).
 2018-02-05 09:04:07 +01:00
Anatol Belski
138ea7c3fe Ensure there are no line breaks in the error msg 2018-02-01 15:30:01 +01:00
Derick Rethans
5feb53964f Sync with timelib 2017.06 2018-01-31 11:55:35 +00:00
Jakub Zelenka
3348d40a7b Use correct certs for SNI server tests with separate key and cert 2018-01-30 20:08:19 +00:00
Jakub Zelenka
aef59537e6 Merge branch 'PHP-7.1' into PHP-7.2 2018-01-30 20:02:34 +00:00
Jakub Zelenka
fe2ac52d50 Use correct certs for SNI server tests 2018-01-30 19:58:40 +00:00
Thomas Punt
0f393a6102 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use the correct freeing function
 2018-01-29 11:13:22 +00:00
Thomas Punt
fb128f6512 Use the correct freeing function 2018-01-29 11:13:10 +00:00
Bishop Bettini
fa586cee3e Fixed bug #54289 
If a directory is passed to Phar::extractTo(), loop over all
entries and extract all files with the given prefix.
 2018-01-28 21:51:25 +01:00
Sam Ding
a8c6b36d62 fixed Big_endian issue on s390x for stream test cases 2018-01-27 16:39:03 +01:00
Christoph M. Becker
96595a232a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature"
 2018-01-27 13:13:06 +01:00
Christoph M. Becker
a882f95e39 Revert "Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature" 
This reverts commit 4bd7658e1b.

To avoid the BC break we apply the fix to master only.
 2018-01-27 13:11:30 +01:00
Christoph M. Becker
d7a02844f9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature
 2018-01-27 12:41:15 +01:00
Christoph M. Becker
4bd7658e1b Fix #75878: RecursiveTreeIterator::setPostfix has wrong signature 2018-01-27 12:33:36 +01:00
Nikita Popov
fd255b8878 Merge branch 'PHP-7.1' into PHP-7.2 2018-01-26 22:28:48 +01:00
Philip Prindeville
aad76a9b79 Be consistent in clearing out in php_iconv_string() 2018-01-26 22:28:27 +01:00
Michael Orlitzky
3fe9e10a1b ext/session: catch incompatible configure flags earlier. 
The session extension has a --with-mm flag that tells it to build
the mm backend ("mm" is the name of the library). However, that
backend is not thread-safe, and mod_mm.c will refuse to compile if
the --enable-maintainer-zts flag was also passed to the configure
script.

Rather than crash halfway through the build, this commit adds a check
to the session extension's config.m4 file. If both --with-mm and
--enable-maintainer-zts are "on," then the configure script will
die and explain that they can't be used together.

PHP-bug: 14269
 2018-01-24 21:22:15 +01:00
Derick Rethans
6dbe046154 Updated to version 2018.3 (2018c) 2018-01-24 13:57:07 +00:00
Derick Rethans
f80e59a566 Updated to version 2018.3 (2018c) 2018-01-24 13:57:06 +00:00
Anatol Belski
e403e122cd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73725 Unable to retrieve value of varchar(max) type
 2018-01-22 17:03:48 +01:00
Anatol Belski
2384ade53c Fixed bug #73725 Unable to retrieve value of varchar(max) type 2018-01-22 17:02:54 +01:00
Xinchen Hui
6184301212 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed #75838 (Memory leak in pg_escape_bytea())
 2018-01-18 10:53:39 +08:00
Xinchen Hui
fb205020ce Fixed #75838 (Memory leak in pg_escape_bytea()) 2018-01-18 10:53:23 +08:00
Anatol Belski
c5768a7e24 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Allow pecl like usage in ext/phar, closes #2955
 2018-01-15 14:25:45 +01:00
Anatol Belski
2d4fb56c1d Allow pecl like usage in ext/phar, closes #2955 2018-01-15 14:23:46 +01:00
Nikita Popov
8c73fc8027 Fixed bug #75653 2018-01-12 18:30:22 +01:00
Anatol Belski
1d05750c50 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75774 imap_append HeapCorruction
 2018-01-12 17:14:19 +01:00
Anatol Belski
cecf734dc3 Fixed bug #75774 imap_append HeapCorruction 2018-01-12 17:13:18 +01:00
Anatol Belski
baaf73be69 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Unify EOL
  Extend test, latest cURL ships also with smb and smbs
 2018-01-12 12:21:43 +01:00
Anatol Belski
9d2662ea4b Unify EOL 2018-01-12 12:20:31 +01:00
Anatol Belski
4bb46c133d Extend test, latest cURL ships also with smb and smbs 2018-01-12 12:17:57 +01:00
Anatol Belski
e3fda6e5f6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test for libtidy 5.6.0
 2018-01-11 14:33:59 +01:00
Anatol Belski
83a77383b9 Fix test for libtidy 5.6.0 
libtidy 5.6.0 remove the language option from the library, it is only
supported on cli. Prior to that, this option was not used in the
library. Thus, exclude the option presence from test.
 2018-01-11 14:29:49 +01:00
Nikita Popov
f208187773 Backport narrowing fix to 7.1 
This is a cherry-pick of 8a4532319d.
 2018-01-09 18:41:46 +01:00
Xinchen Hui
9a2fc39542 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75781 (substr_count incorrect result)
 2018-01-09 16:21:13 +08:00
Xinchen Hui
6da44fefb2 Fixed bug #75781 (substr_count incorrect result) 2018-01-09 16:21:02 +08:00
Dmitry Stogov
cfee682802 Fixed possible incorrect "mark" usage 2018-01-09 10:30:00 +03:00
Anatol Belski
fc6a990891 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix tests
 2018-01-04 16:09:51 +01:00
Anatol Belski
1448f0912f Fix tests 2018-01-04 16:08:41 +01:00
Lior Kaplan
fc528afd2b Happy new year (Update copyright to 2018) 2018-01-04 00:50:42 +02: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
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
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
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
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
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
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
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
Dmitry Stogov
4b5e182d61 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed reference-counting
 2017-12-28 11:20:43 +03:00
Dmitry Stogov
7c96e974d9 Fixed reference-counting 2017-12-28 11:19:52 +03:00
Nikita Popov
12e991f5bd Merge branch 'PHP-7.1' into PHP-7.2 2017-12-22 18:22:47 +01:00
Dmitry Stogov
da61c7a2a4 Fixed bug #75579 (Interned strings buffer overflow may cause crash) 
(cherry picked from commit 37bf8bdc14)
 2017-12-22 18:22:08 +01:00
Nikita Popov
f14b6f4920 Fixed bug #73209 2017-12-22 18:22:00 +01:00
Nikita Popov
2c880037f5 Merge branch 'PHP-7.1' into PHP-7.2 2017-12-22 18:12:17 +01:00
Nikita Popov
ec142f2c86 Fixed bug #75242 2017-12-22 18:11:38 +01:00
Nikita Popov
74e3da5c8c Merge branch 'PHP-7.1' into PHP-7.2 2017-12-22 18:01:30 +01:00
Nikita Popov
ccb113c3e5 Fixed bug #75717 2017-12-22 18:01:03 +01:00
Nikita Popov
3237336985 Merge branch 'PHP-7.1' into PHP-7.2 2017-12-22 17:50:04 +01:00
Anton Artamonov
0246373788 Fixed bug #70469 
Don't generate an E_ERROR if we've already thrown an exception.
This interacts badly with error_get_last() checks.
 2017-12-22 17:47:54 +01:00
Anatol Belski
2252d8d730 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix wrong return value for fail case in set attribute handler in pdo_odbc
 2017-12-22 16:45:25 +01:00
Anatol Belski
77b0e2fd3f Fix wrong return value for fail case in set attribute handler in pdo_odbc 2017-12-22 16:41:46 +01:00
Anatol Belski
a93445bf55 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  pdo_odbc has no driver API for quoting, skip the test
 2017-12-22 16:28:10 +01:00
Anatol Belski
d7cc1ce58f pdo_odbc has no driver API for quoting, skip the test 2017-12-22 16:22:12 +01:00
Dmitry Stogov
a1810758d5 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75579 (Interned strings buffer overflow may cause crash)
 2017-12-21 23:36:51 +03:00
Dmitry Stogov
f2c22d11cc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75579 (Interned strings buffer overflow may cause crash)
 2017-12-21 23:35:23 +03:00
Dmitry Stogov
37bf8bdc14 Fixed bug #75579 (Interned strings buffer overflow may cause crash) 2017-12-21 23:34:21 +03:00
Anatol Belski
4d45f53e87 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Ensure expected items delivered in same order
 2017-12-21 18:38:16 +01:00
Anatol Belski
cc5a0da006 Ensure expected items delivered in same order 2017-12-21 18:37:23 +01:00
Anatol Belski
9408f1efa7 Update libmagic.patch 2017-12-21 15:43:04 +01:00
Riccardo Magliocchetti
e313daa598 fileinfo: fix misleading indentation in libmagic 2017-12-21 15:39:00 +01:00
Anatol Belski
dcc3f00090 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Templatize driver name in the expected string
 2017-12-20 18:50:10 +01:00
Anatol Belski
c2308d5d7c Templatize driver name in the expected string 2017-12-20 18:46:56 +01:00
Remi Collet
c21ec44b21 display headers (buildtime) and library (runtime) versions in phpinfo (libzip >= 1.3.1) 2017-12-19 14:46:32 +01:00
Jaromír Doleček
11eed9f3ba Fixed bug #75616 
PDO can be built shared on Darwin nowadays. There used to be issues
relating to symbol references between dynamically loaded shared
objects.
 2017-12-17 12:56:37 +01:00
Jaromír Doleček
200bf9b5d7 Fix bug #75615 
Remove -I without argument in pdo_mysql config.m4.
 2017-12-17 12:47:35 +01:00
Xinchen Hui
a3b5b93ba9 Updated NEWS 2017-12-17 09:42:01 +08:00
Nikita Popov
340255a694 Fixed bug #75614 
Replace non-standard == with = in shell scripts.
 2017-12-16 22:31:10 +01:00
Nikita Popov
ee45104dba Fixed bug #75698 2017-12-16 22:04:18 +01:00
Nikita Popov
19d0c5dc9f Add test for bug #75681 
The issue itself has been fixed by 8a4532319d.
 2017-12-16 21:24:26 +01:00
Nikita Popov
8a4532319d Improve fix for bug #75687 
Adding an (incorrect) UNDEF here may cause subsequent narrowing in
other places.

Instead, let's try to handle this edge-case once for all
instructions...
 2017-12-16 21:11:40 +01:00
Xinchen Hui
a20c9bd3fe Fixed bug #75687 (var 8 (TMP) has array key type but not value type) 2017-12-16 23:59:10 +08:00
Anatol Belski
171f1baff1 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75671 pg_version() crashes when called on a connection to cockroach
 2017-12-15 15:34:44 +01:00
Anatol Belski
acf1472ffd Fixed bug #75671 pg_version() crashes when called on a connection to cockroach 2017-12-15 15:33:14 +01:00
Anatol Belski
ed210c186a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75679 Path 260 character problem
 2017-12-14 16:17:37 +01:00
Anatol Belski
4c0af1fbd4 Fixed bug #75679 Path 260 character problem 2017-12-14 16:16:50 +01:00
Nikita Popov
c069db52ae Merge branch 'PHP-7.1' into PHP-7.2 2017-12-09 19:07:40 +01:00
Michael Heimpold
1b10e6318b ext/imap/config.m4: fix ac_cv_u8t_decompose check 
Once upon the time, commit c58f63a38a
changed the check from U8T_CANONICAL to U8T_DECOMPOSE. However,
the autoconf cache id was not renamed.

Sometimes it is desirable to preseed the autoconf variables, e.g. when
cross-compiling to avoid the tests running on the host system. In this
case it's confusing when the cache id does not match the variable to
set, so let's adjust it.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
 2017-12-09 19:05:45 +01:00
Anatol Belski
57f33b4ce2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix yet one data race in PCRE
 2017-12-06 16:04:22 +01:00
Anatol Belski
1b29dc0b1c Fix yet one data race in PCRE 
PCRE 8.x initializes the pattern compiler on demand during the first
pcre_study call. It could be worse, but since the compiled patterns are
cached, the locking impact is minimal. PCRE 10.x always compiles the
pattern and thread sanitizer doesn't complain about the compiler
initialization, thus the newer PCRE version seems to be unafected.
 2017-12-06 15:59:21 +01:00
Anatol Belski
d4af204637 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix use after free revealed by phpdbg
 2017-12-05 18:34:39 +01:00
Anatol Belski
092fd44474 Fix use after free revealed by phpdbg 2017-12-05 18:32:32 +01:00
Anatol Belski
75a2ee7f7b Fixed bug #75601 Thread race in PCRE JIT support 2017-12-05 17:40:00 +01:00
Anatol Belski
31b2b14a71 Fixed bug #75601 Thread race in PCRE JIT support 2017-12-05 17:38:18 +01:00
Dmitry Stogov
3503dc7482 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75608 ("Narrowing occurred during type inference" error)
 2017-12-04 17:22:28 +03:00
Dmitry Stogov
5934bff913 Fixed bug #75608 ("Narrowing occurred during type inference" error) 2017-12-04 17:22:06 +03:00
Anatol Belski
36f85e17e2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix compat with libcurl 7.56.1+ and file:// wrapper
 2017-12-03 12:28:41 +01:00
Anatol Belski
aaf00ae0a9 Fix compat with libcurl 7.56.1+ and file:// wrapper 
Since 7.52.x libcurl file:// scheme was implemented in a way described
in https://tools.ietf.org/html/draft-ietf-appsawg-file-scheme-16 . The
draft is still not accepted and the change contained a BC breach with
win32 path handling. It was reported upstream and 7.52.x fixed it, but
the BC breaching behavior was reintroduced in 7.56.1. Thus, it is better
to handle this on the PHP side.
 2017-12-03 12:23:25 +01:00
Christoph M. Becker
995ac8a094 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Define floorf if system doesn't have it (follow up for 22c48761)
 2017-11-29 16:59:17 +01:00
Christoph M. Becker
f166ea9c09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Define floorf if system doesn't have it (follow up for 22c48761)
 2017-11-29 16:53:11 +01:00
Lior Kaplan
32e3d7b99e Define floorf if system doesn't have it (follow up for 22c48761) 
floorf is checked in config.m4
 2017-11-29 16:46:47 +01:00
Frank Denis
fc8793499a Revert "Revert "ext/sodium: pwhash: do not warn on low parameters"" 
This reverts commit a1845b7fdb.

Revert "Revert "ext/sodium: throw exceptions instead of errors""
This reverts commit 31d221f9c7.
 2017-11-29 13:19:56 +01:00
Frank Denis
a1845b7fdb Revert "ext/sodium: pwhash: do not warn on low parameters" 
This reverts commit c219991c77.
 2017-11-29 01:22:59 +01:00
Nikita Popov
1d557e4a62 Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2 2017-11-28 23:37:05 +01:00
Nikita Popov
060baf78cb Merge branch 'PHP-7.1' into PHP-7.2 2017-11-28 23:34:25 +01:00
johnstevenson
6ed242dfc8 Fixed #73124: php_ini_scanned_files() 
Additional ini files are reported using the --ini option, but not by
`php_ini_scanned_files()`, which relied on PHP_CONFIG_FILE_SCAN_DIR.
 2017-11-28 23:33:48 +01:00
Frank Denis
31d221f9c7 Revert "ext/sodium: throw exceptions instead of errors" 
This reverts commit c05cbd1e77.
 2017-11-28 23:30:21 +01:00
Remi Collet
9c8748316a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  NEWS
  NEWS
  Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
 2017-11-28 18:00:21 +01:00
Remi Collet
40f2668230 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)
 2017-11-28 17:59:36 +01:00
Remi Collet
8e5b9532da Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM) 2017-11-28 17:58:28 +01:00
Remi Collet
bd44a2cb05 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  better fix for #75514
 2017-11-28 17:43:15 +01:00
Remi Collet
2b07102897 better fix for #75514 2017-11-28 17:42:43 +01:00
Frank Denis
c05cbd1e77 ext/sodium: throw exceptions instead of errors 2017-11-28 13:56:11 +01:00
Frank Denis
c219991c77 ext/sodium: pwhash: do not warn on low parameters 
but raise an explicit error if these are too low
 2017-11-28 11:24:49 +01:00
Xinchen Hui
e02c2d2dfb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWs (added bug entry)
 2017-11-28 13:16:22 +08:00
Xinchen Hui
ee9e32caca Update NEWs (added bug entry) 2017-11-28 13:15:54 +08:00
Anatol Belski
eb0cc77133 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix allocation
  Fix memory leak
 2017-11-27 21:18:54 +01:00
Anatol Belski
06202f0feb Fix allocation 2017-11-27 21:18:08 +01:00
Anatol Belski
2868ff84df Fix memory leak 2017-11-27 20:24:30 +01:00
Anatol Belski
3c0bd0014d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character
 2017-11-27 18:50:05 +01:00
Anatol Belski
2b7d283cc5 Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character 2017-11-27 18:49:02 +01:00