1
0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Commit Graph

48300 Commits

Author SHA1 Message Date
Christoph M. Becker
eed3637d84 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix #76409: heap use after free in _php_stream_free
2018-06-09 17:57:10 +02:00
Christoph M. Becker
3fdde65617 Fix #76409: heap use after free in _php_stream_free
We must not close the stream in exif_read_from_impl(), since it is the
responsibility of the (caller's) caller to do so, if it actually opened
the stream.

We simplify the reproduce script, which is actually about supplying a
path to a directory (opposed to a regular file), and use `.` instead of
`/` to also make it work on Windows.
2018-06-09 17:52:05 +02:00
Peter Kokot
7bb741cad9 Remove exif version from the phpinfo output
This patch removes the exif version in the phpinfo output to sync it
with the rest of the php bundled extensions. Also in the past the
revision id from the version control system was used and is today not
needed anymore.
2018-06-09 15:32:21 +02:00
Nikita Popov
777187cbaf Don't use UNREFs during array operations
Perform DEREFs instead. We were already doing this in some, but not
all places.

While UNREFs are supposed to be transparent, in practice they have
rare observable side effects. Calling array_merge() on an array
should never change how that array behaves.
2018-06-09 13:20:13 +02:00
Anatol Belski
9cd2d77514 Fixed bug #76422 ftruncate fails on files > 2GB 2018-06-09 11:28:24 +02:00
Nikita Popov
968eb0b38c Fix mysqlnd build without openssl 2018-06-09 11:04:40 +02:00
Nikita Popov
befc518c82 Merge branch 'PHP-7.2' 2018-06-08 23:11:45 +02:00
Nikita Popov
e029019275 Deduplicate code using php_timezone_to_string()
Looks like this usage was overlooked when the function was
introduced.
2018-06-08 23:10:43 +02:00
David Carlier
ad52ec3db8 cast to int to disable compilation warnings. 2018-06-08 23:08:42 +02:00
Peter Kokot
25c35ab30a Sync phpinfo output for pdo_pgsql
This patch removes the module version and revision from the phpinfo
output to sync the phpinfo with the rest of the bundled extensions.
2018-06-08 23:06:22 +02:00
Nikita Popov
fc8f5b0f09 Merge branch 'PHP-7.2' 2018-06-08 23:02:25 +02:00
Keyur Govande
695b8192c7 Avoid leaking the urandom fd
When Apache is reloaded, it unloads the extension, but the open file descriptor to /dev/urandom is left hanging around and is leaked. This fixes the bug.

Duplicate of https://github.com/jedisct1/libsodium-php/pull/173
2018-06-08 23:01:57 +02:00
Anatol Belski
7bef16c37b Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix VC compilation as variable size array is not supported
  NEWS for 7.2.8
2018-06-06 11:21:11 +02:00
Anatol Belski
0bafb530d6 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix VC compilation as variable size array is not supported
  Fix MySQL 8 auth
2018-06-06 11:14:15 +02:00
Anatol Belski
f96df64cb2 Fix VC compilation as variable size array is not supported 2018-06-06 11:13:28 +02:00
Johannes Schlüter
cb5c1fbe10 Merge branch 'master' of git.php.net:/php-src 2018-06-06 00:25:01 +02:00
Johannes Schlüter
04db3d0f7a Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 2018-06-06 00:24:41 +02:00
Johannes Schlüter
84f6f693e7 Merge branch 'PHP-7.1' 2018-06-06 00:24:19 +02:00
Johannes Schlüter
d6e81f0bfd Fix MySQL 8 auth 2018-06-06 00:17:34 +02:00
Christoph M. Becker
c4331b00be Update to SQLite 3.24.0 2018-06-05 15:01:02 +02:00
Xinchen Hui
0a0f6c495f Merge branch 'PHP-7.2'
* PHP-7.2:
  Fixed bug #76410 (SIGV in zend_mm_alloc_small)
  Fix bug #76390 - do not allow invalid strings in range()

Conflicts:
	ext/standard/array.c
2018-06-05 17:16:45 +08:00
Xinchen Hui
951e29f66e Fixed bug #76410 (SIGV in zend_mm_alloc_small) 2018-06-05 17:15:57 +08:00
Stanislav Malyshev
c12fc77bdf Fix bug #76390 - do not allow invalid strings in range() 2018-06-04 22:54:03 -07:00
Stanislav Malyshev
5fbb0988d1 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix bug #76390 - do not allow invalid strings in range()
2018-06-04 22:51:38 -07:00
Stanislav Malyshev
73bf238507 Fix bug #76390 - do not allow invalid strings in range() 2018-06-04 22:44:05 -07:00
Peter Kokot
279498564f Remove enchant version from the phpinfo output
This patch syncs the phpinfo output with other bundled extensions.
2018-06-04 18:40:38 +02:00
Peter Kokot
24e1ae0e90 Remove some old occurrences of configure.in
configure.ac is the recommended file to use instead of the old
configure.in which will be removed in autotools future versions.
2018-06-04 17:59:00 +02:00
Peter Kokot
cf6b24ccda Sync tidy phpinfo extension version
This patch removes the tidy extension Git ident attribute blob name from
the phpinfo output to be synced with other extensions versioning system
and replaces table header with normal row in the first tidy info table.
2018-06-04 17:10:49 +02:00
Peter Kokot
cb64696ca6 Normalize the ldap extension version in phpinfo output
This patch normalizes the phpinfo output for the ldap extension and
removes the displayed Git attribute ident blob object name.
2018-06-04 17:06:41 +02:00
Peter Kokot
ede39739fd Normalize Reflection phpinfo() output
This patch normalizes the Reflection extension version in the phpinfo
output. It removes the Git attributes ident blob object name from Git
repository as an extension version.

Also the table output is synced with other extensions (i.e. enabled
in a row instead of table header).
2018-06-04 16:28:16 +02:00
Anatol Belski
01b9975639 [ci skip] Update libmagic.patch 2018-06-03 14:06:11 +02:00
Anatol Belski
6f24d75b56 Remove unnecessary decls, php.h is included 2018-06-03 12:45:37 +02:00
Anatol Belski
4363588f2f Align the ported place with libmagic 2018-06-03 12:14:42 +02:00
Peter Kokot
07257a59d0 Normalize SimpleXML phpinfo output 2018-06-02 13:44:41 +02:00
Peter Kokot
c71433a774 Remove revision for recode from phpinfo 2018-06-02 13:43:49 +02:00
Peter Kokot
c03ee19230 Normalize the POSIX phpinfo output
Instead of the Git attributes ident blob object name display only
extension status (enabled).
2018-06-02 13:35:22 +02:00
Peter Kokot
40c1d5d4e2 Normalize filter phpinfo() output
This patch normalizes the filter extension version in the php info
output. Instead of the Git attributes ident blob object name from Git
repository only extension status is displayed.
2018-06-02 13:35:22 +02:00
Peter Kokot
0a37b48284 Normalize sysvmsg phpinfo() output
This patch normalizes the sysvmsg extension version in the php info
output. Instead of the Git attributes ident blob object name from Git
repository it only displays the extension status.

Remove sysvmsg version
2018-06-02 13:35:21 +02:00
Peter Kokot
1fd7cbb49e Fix warnings defined but not used 2018-06-02 13:30:40 +02:00
Dmitry Stogov
0b90cf85a6 Removed "dead" code (zend_hash_update() never fails) 2018-06-01 11:58:57 +03:00
Dmitry Stogov
9e0f131d2b Fixed ISSET/ISEMPTY bit meaning to simplify run-time checks 2018-05-31 19:02:51 +03:00
Anatol Belski
ca2e9df56c Fix AVX part 2018-05-31 14:15:28 +02:00
Dmitry Stogov
f2b4ec4bdc Export standard object handlers, to avoid indirect access 2018-05-31 11:57:22 +03:00
Dmitry Stogov
45d62d9f9b Use SSE/AVX instructions 2018-05-30 20:59:29 +03:00
Dmitry Stogov
3c122e1605 Avoid rehashing of "packed" array 2018-05-30 20:17:25 +03:00
Peter Kokot
28136b071a Remove build system files of bundled library libbcmath
The bundled library libbcmath is maintained in the php-src and its
build system files are outdated and not used.
2018-05-29 18:56:50 +02:00
Dmitry Stogov
d90c6f2443 Removed useless zval_ptr_dtor() 2018-05-29 17:58:06 +03:00
Dmitry Stogov
44be0fa67b Fixed HashTable load factor 2018-05-29 10:16:02 +03:00
Peter Kokot
8cc8b48a63 Update year range in hrtime c and h files 2018-05-28 22:14:52 +02:00
Peter Kokot
af01ef8741 Remove unused binary_pipes option
Option binary_pipes was added in PHP 6 which was then refactored
and this option was removed.
2018-05-28 22:14:37 +02:00