php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 01:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
108,537 Commits 547 Branches 1,481 Tags
aec2d63124151be4eed360c01a289bf3ab577fc2
Commit Graph

48801 Commits

Author SHA1 Message Date
Pierrick Charron
aec2d63124 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-17 20:31:07 -04:00
Pierrick Charron
bc1ecd5d7f Merge branch 'PHP-7.1' into PHP-7.2 2018-09-17 20:30:18 -04:00
Pierrick Charron
3bb218a0a7 Fix 76480: Use curl_multi_wait() so that timeouts are respected 2018-09-17 20:28:44 -04:00
Christoph M. Becker
ae46e20879 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #76886: Can't build xmlrpc with expat
 2018-09-15 13:24:48 +02:00
Thomas Petazzoni
3691b6d245 Fix #76886: Can't build xmlrpc with expat 
We fix it by including "php.h" in the HAVE_LIBEXPAT case.
 2018-09-15 13:21:53 +02:00
Anatol Belski
b9bcca0080 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Backport changes for OpenSSL 1.1.1 CI integration
 2018-09-13 11:06:47 +02:00
Anatol Belski
922f1a0dcf Backport changes for OpenSSL 1.1.1 CI integration 
Add debug message for failing test parts

(cherry picked from commit a45169a6ba)

Show all unmatched errors when test failed

(cherry picked from commit 7015965254)

More possibly colliding libs to remove from the test image

(cherry picked from commit 3008ad1a49)

Remove colliding file from CI image

(cherry picked from commit 6220d21c34)

Fix typo

(cherry picked from commit 24517d82cf)
 2018-09-13 11:03:42 +02:00
Anatol Belski
ed5262b589 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Improve error code matching
 2018-09-12 16:25:39 +02:00
Anatol Belski
05a4fec761 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Improve error code matching
 2018-09-12 16:24:38 +02:00
Anatol Belski
19ab91781e Improve error code matching 2018-09-12 16:22:22 +02:00
Dmitry Stogov
64dad57d19 Fixed wrong assertion 2018-09-10 15:26:38 +03:00
Anatol Belski
27b270de89 Skip test on unsuitable env 2018-09-10 09:51:36 +02:00
Jakub Zelenka
9eec7d06f6 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-09 18:59:47 +01:00
Jakub Zelenka
87a9536bda Merge branch 'PHP-7.1' into PHP-7.2 2018-09-09 18:58:23 +01:00
Jakub Zelenka
be50a72715 Fix ssl stream reneg limit test to print only after first renegotiation 
It has been reported that in some setup the test does multiple
renegotiations which is allowed.
 2018-09-09 18:53:55 +01:00
Anatol Belski
68c34ce0dc Make a copy unconditionally 2018-09-09 10:42:53 +02:00
Anatol Belski
9278be148e Fix memory leak in pcre cache 2018-09-09 10:38:36 +02:00
Anatol Belski
4905d5e0df Add test for bug #76850 2018-09-08 21:39:54 +02:00
Anatol Belski
c6ddd45650 Fixed bug #76850 Exit code mangled by set locale/preg_match 2018-09-08 21:35:23 +02:00
Christoph M. Becker
58e2f5ead1 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
 2018-09-08 19:13:26 +02:00
Christoph M. Becker
fa70b91a4f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
 2018-09-08 19:09:56 +02:00
Christoph M. Becker
90d863898c Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed 
Whenever we return with `PSFS_PASS_ON`, we need to update
`bytes_consumed` to not mislead the caller.  Instead of fixing the
respective `if` clauses, we eschew the early bail-outs to simplify the
code a bit.
 2018-09-08 19:01:36 +02:00
Nikita Popov
a32c563e50 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-07 14:02:51 +02:00
Nikita Popov
cfdd828163 Fixed bug #76796 2018-09-07 14:02:03 +02:00
Anatol Belski
6c376996cf Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Sync with recent changes to default libcurl build
 2018-09-05 21:30:25 +02:00
Anatol Belski
b323e1e8d0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync with recent changes to default libcurl build
 2018-09-05 21:29:53 +02:00
Anatol Belski
28c6125053 Sync with recent changes to default libcurl build 
(cherry picked from commit a1ba3007a4)
 2018-09-05 21:28:59 +02:00
Christoph M. Becker
21cd552e1e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #74454: Wrong exception being thrown when using ReflectionMethod
 2018-09-05 15:10:27 +02:00
Christoph M. Becker
7a2c9585c4 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #74454: Wrong exception being thrown when using ReflectionMethod
 2018-09-05 15:07:59 +02:00
Christoph M. Becker
c0a389a927 Fix #74454: Wrong exception being thrown when using ReflectionMethod 
If zend_throw_exception_ex() already threw an exception, we should not
throw again.
 2018-09-05 15:05:19 +02:00
Joe Watkins
6b5e7e6b42 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #74764 and add a test case
 2018-09-04 11:13:14 +02:00
Joe Watkins
21f8cd2a92 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #74764 and add a test case
 2018-09-04 11:12:39 +02:00
Ville Hukkamaki
0f724453c0 Fix bug #74764 and add a test case 2018-09-04 11:12:04 +02:00
Anatol Belski
2476fb76a7 Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3 
It would probably be better to remove this test as it's too much
maintanance for a little gain.
 2018-09-04 10:53:35 +02:00
Nikita Popov
63072e9c0e Merge branch 'PHP-7.2' into PHP-7.3 2018-09-04 05:57:07 +02:00
Nikita Popov
edec566d9b Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 05:49:02 +02:00
Nikita Popov
03740ef7df Revert all MySQL auth related changes 
Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.

Revert "Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)"

This reverts commit 11507c0e1b.

Revert "Fix mysqlnd build without openssl"

This reverts commit 6c9db02ff7.

Revert "Fix VC compilation as variable size array is not supported"

This reverts commit f96df64cb2.

Revert "Fix MySQL 8 auth"

This reverts commit d6e81f0bfd.
 2018-09-04 05:47:28 +02:00
Nikita Popov
4cbabb6852 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-04 05:32:52 +02:00
Nikita Popov
08addfea86 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 05:32:42 +02:00
Nikita Popov
f1f39d7ed7 Fix parenthesis warning 2018-09-04 05:32:25 +02:00
Peter Kokot
870d893d0b Fix bug #75481: makedev warning 
To use makedev the sys/sysmacros.h needs to be included on newer
systems.

Cherry-picked from PHP-7.3.
 2018-09-04 05:13:45 +02:00
Nikita Popov
153e292e10 Escape trigraph sequence 
??= is a trigraph for #, so it needs to be escaped. To stay
consistent I'm escaping all question marks in this literal, even
though one of the latter two would suffice.
 2018-09-04 05:07:43 +02:00
Nikita Popov
6122f67492 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-04 04:57:13 +02:00
Nikita Popov
fcf78dfb89 Merge branch 'PHP-7.1' into PHP-7.2 2018-09-04 04:55:15 +02:00
Ville Hukkamaki
742783c3ee Fixed bug #73457 
Correctly report errors when opening FTP data connection.
 2018-09-04 04:53:38 +02:00
Anatol Belski
1640d9182a Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
 2018-09-03 15:11:10 +02:00
Anatol Belski
a6b8651d94 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
 2018-09-03 15:10:25 +02:00
Anatol Belski
f26172f934 Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS 2018-09-03 15:09:23 +02:00
Christoph M. Becker
3e863ff29e Update to Oniguruma 6.9.0 2018-09-03 12:26:03 +02:00
Jakub Zelenka
217888ed26 Merge branch 'PHP-7.2' into PHP-7.3 2018-09-02 20:02:09 +01:00