]>
granicus.if.org Git - php/log
Letargie [Wed, 26 Sep 2018 09:41:50 +0000 (11:41 +0200)]
Merge branch 'master' of https://github.com/php/php-src into feature-getcolumnmeta
Peter Kokot [Wed, 26 Sep 2018 04:11:13 +0000 (06:11 +0200)]
Make ext/session/mod_files.sh executable
Making shell script executable makes it possible to run like
`ext/session/mod_files.sh` and avoids error permission denied.
Peter Kokot [Tue, 25 Sep 2018 20:50:17 +0000 (22:50 +0200)]
Sara Golemon [Tue, 25 Sep 2018 20:44:16 +0000 (16:44 -0400)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Bump version
Sara Golemon [Tue, 25 Sep 2018 20:43:40 +0000 (16:43 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump version
Sara Golemon [Tue, 25 Sep 2018 20:37:41 +0000 (16:37 -0400)]
Bump version
Peter Kokot [Tue, 25 Sep 2018 20:30:22 +0000 (22:30 +0200)]
Remove unused ext/enchant/tests files
- ext/enchant/tests/hindi_correct.txt
- ext/enchant/tests/hindi_incorrect.txt
Added via
5956f9a3984249a763ce629532a01073de8109fe but never used.
Nikita Popov [Mon, 24 Sep 2018 19:23:53 +0000 (21:23 +0200)]
Remove unused "dummy" member in reflection_object
Nikita Popov [Mon, 24 Sep 2018 19:01:44 +0000 (21:01 +0200)]
Reformat macros in php_reflection.c
Sara Golemon [Tue, 25 Sep 2018 16:10:33 +0000 (12:10 -0400)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76918 Repeated parameter name in arg info
Sara Golemon [Tue, 25 Sep 2018 16:10:21 +0000 (12:10 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76918 Repeated parameter name in arg info
Sara Golemon [Tue, 25 Sep 2018 16:09:38 +0000 (12:09 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76918 Repeated parameter name in arg info
Sara Golemon [Tue, 25 Sep 2018 15:18:24 +0000 (11:18 -0400)]
Fixed bug #76918 Repeated parameter name in arg info
Dmitry Stogov [Tue, 25 Sep 2018 12:44:56 +0000 (15:44 +0300)]
Removed unused function
Christoph M. Becker [Tue, 25 Sep 2018 09:29:50 +0000 (11:29 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update NEWS wrt. php-7.3.0RC2 tagging
Christoph M. Becker [Tue, 25 Sep 2018 09:29:01 +0000 (11:29 +0200)]
Update NEWS wrt. php-7.3.0RC2 tagging
Christopher Jones [Mon, 24 Sep 2018 10:53:42 +0000 (20:53 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 10:53:31 +0000 (20:53 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 10:53:11 +0000 (20:53 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 10:52:58 +0000 (20:52 +1000)]
Terminate smart string correctly
This is related to Zend VM regression bug #75881. The regression was fixed in the VM, so there is no user visible change from the termination correction.
Christopher Jones [Mon, 24 Sep 2018 10:14:16 +0000 (20:14 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 10:14:05 +0000 (20:14 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 10:06:05 +0000 (20:06 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 10:05:54 +0000 (20:05 +1000)]
Make usable for PECL OCI8 release for PHP 7.x
Christopher Jones [Mon, 24 Sep 2018 07:07:12 +0000 (17:07 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 07:07:06 +0000 (17:07 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 07:06:59 +0000 (17:06 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 07:06:29 +0000 (17:06 +1000)]
Backport master branch comment typo fix
Christopher Jones [Mon, 24 Sep 2018 07:03:09 +0000 (17:03 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 07:02:36 +0000 (17:02 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 07:01:20 +0000 (17:01 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 07:01:13 +0000 (17:01 +1000)]
Make tests portable across PHP 7.x versions
Christopher Jones [Mon, 24 Sep 2018 06:52:40 +0000 (16:52 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 06:52:33 +0000 (16:52 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 06:52:26 +0000 (16:52 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 06:52:17 +0000 (16:52 +1000)]
Remove $id from phpinfo as already done in PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 06:41:48 +0000 (16:41 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 06:41:35 +0000 (16:41 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 06:38:47 +0000 (16:38 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 06:38:39 +0000 (16:38 +1000)]
And strip trailing tabs too...
Christopher Jones [Mon, 24 Sep 2018 06:02:31 +0000 (16:02 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 06:02:19 +0000 (16:02 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 06:00:04 +0000 (16:00 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 05:59:52 +0000 (15:59 +1000)]
Sync EXPECT usage with PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 03:34:28 +0000 (13:34 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Mon, 24 Sep 2018 03:33:54 +0000 (13:33 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 03:27:35 +0000 (13:27 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 03:27:27 +0000 (13:27 +1000)]
Remove trailing whitespace to help keep branches in sync
Christopher Jones [Sun, 23 Sep 2018 23:57:37 +0000 (09:57 +1000)]
Merge branch 'PHP-7.3'
Christopher Jones [Sun, 23 Sep 2018 23:57:20 +0000 (09:57 +1000)]
Merge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Sun, 23 Sep 2018 23:56:53 +0000 (09:56 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Sun, 23 Sep 2018 23:37:46 +0000 (09:37 +1000)]
Remove trailing whitespace to help keep branches in sycn
Peter Kokot [Sun, 23 Sep 2018 20:44:58 +0000 (22:44 +0200)]
Remove outdated zlib readme file for windows build
Peter Kokot [Fri, 21 Sep 2018 18:06:47 +0000 (20:06 +0200)]
Rename *.php files in ext/dom tests to *.inc
*.php files are ignored by Git and a better practice might be to rename
PHP included files for tests.
Peter Kokot [Fri, 21 Sep 2018 18:25:04 +0000 (20:25 +0200)]
Rename *.php files in Zend/tests to *.inc
*.php files are ignored by Git and a better practice might be to rename
PHP included files for tests.
Peter Kokot [Sun, 23 Sep 2018 14:46:58 +0000 (16:46 +0200)]
Sync ext/spl/README with current set of example files
Nikita Popov [Sun, 16 Sep 2018 09:48:48 +0000 (11:48 +0200)]
Bump minimum libxml version to 2.7.6
Released Oct 2009, part of RHEL 6.
Nikita Popov [Sun, 23 Sep 2018 13:29:25 +0000 (15:29 +0200)]
Handle binary_op failure in overloaded assigns
bugreportuser [Sat, 22 Sep 2018 15:02:23 +0000 (11:02 -0400)]
Remove unnecessary base64_encode() return value check
php_base64_encode() never returns NULL, so base64_encode() will never return
false.
Anatol Belski [Sun, 23 Sep 2018 09:42:41 +0000 (11:42 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS
Anatol Belski [Sun, 23 Sep 2018 09:42:07 +0000 (11:42 +0200)]
[ci skip] Update NEWS
Nikita Popov [Sat, 22 Sep 2018 16:45:11 +0000 (18:45 +0200)]
Drop WE_DONT_COPY_IN_BUFFERED_AND_UNBUFFERED_BECAUSEOF_IS_REF
And perform some code cleanups this allows.
Nikita Popov [Sat, 22 Sep 2018 15:43:23 +0000 (17:43 +0200)]
Remove duplicate test file
This is already tested in Zend/tests/bug63463.phpt.
Nikita Popov [Fri, 21 Sep 2018 07:00:51 +0000 (09:00 +0200)]
Drop ext/spl/spl.php
Leftover from ext/spl/internal, which was removed previously.
Christoph M. Becker [Sat, 22 Sep 2018 13:57:28 +0000 (15:57 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #66828: iconv_mime_encode Q-encoding longer than it should be
Christoph M. Becker [Sat, 22 Sep 2018 13:43:06 +0000 (15:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #66828: iconv_mime_encode Q-encoding longer than it should be
Christoph M. Becker [Sat, 22 Sep 2018 13:30:08 +0000 (15:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #66828: iconv_mime_encode Q-encoding longer than it should be
Christoph M. Becker [Sat, 22 Sep 2018 13:20:20 +0000 (15:20 +0200)]
Fix #66828: iconv_mime_encode Q-encoding longer than it should be
Before the fix for bug 48289 has been applied, the algorithm to
construct a Q-encoded-word has been optimistic, i.e. try to encode as
many bytes that *may* fit in the remaining space, calculate the actual
length of the Q-encoded word, and if it's too long, try again with a
reduced size. However, the fix for the mentioned bug replaced this by
a pessimistic algorithm, which always terminates[1] the for loop[2]
during the first iteration (which renders the following 3 lines as dead
code), and as such easily produces unnecessarily short encoded-words.
Instead the proper fix for the bug would have been to make sure that
`out_size` is always decremented, if the space isn't sufficient for the
encoded-word.
[1] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1421>
[2] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1360>
Anatol Belski [Sat, 22 Sep 2018 00:11:06 +0000 (02:11 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix test and add skip section
Anatol Belski [Sat, 22 Sep 2018 00:10:43 +0000 (02:10 +0200)]
Fix test and add skip section
Anatol Belski [Fri, 21 Sep 2018 14:27:51 +0000 (16:27 +0200)]
[ci skip] Update UPGRADING.INTERNALS
Peter Kokot [Fri, 21 Sep 2018 17:07:49 +0000 (19:07 +0200)]
Rename *.p5c files to *.inc
When including files in PHP tests a good practice so far has been to use
the *.inc extension. This patch renames few *.p5c files that are
included in phpt files.
Peter Kokot [Sat, 15 Sep 2018 15:26:02 +0000 (17:26 +0200)]
Add directory structure to the contributing docs
This patch adds a php-src directory structure introduction to the
contributing guidelines. Thanks to the discussion at [1] and PHP
manual.
[1] https://github.com/php/php-src/pull/3520
Anatol Belski [Fri, 21 Sep 2018 13:58:50 +0000 (15:58 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Add test for bug #76909
Fixed bug #76909 preg_match difference between 7.3 and < 7.3
Upgrade PCRE2 to 10.32
Anatol Belski [Fri, 21 Sep 2018 13:57:00 +0000 (15:57 +0200)]
Add test for bug #76909
Anatol Belski [Fri, 21 Sep 2018 13:55:03 +0000 (15:55 +0200)]
Fixed bug #76909 preg_match difference between 7.3 and < 7.3
Applied upstream patch, see https://bugs.exim.org/show_bug.cgi?id=2321
Anatol Belski [Tue, 18 Sep 2018 12:16:06 +0000 (14:16 +0200)]
Upgrade PCRE2 to 10.32
(cherry picked from commit
d918e0776b5168aed2707b0ca500589844f0faa8 )
Christoph M. Becker [Fri, 21 Sep 2018 13:00:07 +0000 (15:00 +0200)]
Update NEWS and UPGRADING wrt. PR 2760
Christoph M. Becker [Fri, 21 Sep 2018 13:06:35 +0000 (15:06 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix
Fix
Peter Kokot [Tue, 18 Sep 2018 20:46:20 +0000 (22:46 +0200)]
Fix permissions
Certain files don't need to be executables.
Peter Kokot [Tue, 18 Sep 2018 17:26:19 +0000 (19:26 +0200)]
Remove HAVE_TIME_H
The `<time.h>` header file is part of the standard C89 headers [1] and
on current systems can be included unconditionally.
Since PHP requires at least C89 or greater, the `HAVE_TIME_H` symbol
defined by Autoconf in ext/pdo_sqlite/config.m4 [2] can be ommitted and
simplifed.
Additionally, since PHP didn't define `HAVE_TIME_H` prior in the
configure.ac the occurrence of this symbol in cli can be removed.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Letargie [Fri, 21 Sep 2018 11:35:45 +0000 (13:35 +0200)]
cs
Letargie [Fri, 21 Sep 2018 11:27:11 +0000 (13:27 +0200)]
Merge branch 'feature-getcolumnmeta' of https://github.com/Letargie/php-src into feature-getcolumnmeta
Letargie [Fri, 21 Sep 2018 11:16:54 +0000 (13:16 +0200)]
Changes :
. Add the distinction between NUMBER and FLOAT types
. Changing BFLOAT text to be BINARY_FLOAT
. Changing BDOUBLE text to be BINARY_DOUBLE
. Add the data types names for NCHAR, NVARCHAR and NCLOB
. Few changes in the tests
Also, my commit is correcting a bug in the function oci_stmt_describe. PDO override the values given for the precision using the content of the pdo_column_data property 'precision'.
That value was set in oci_stmt_describe but with the value of OCI_ATTR_SCALE, causing a bug for the precision value returned by getColumnMeta() (values between 12800 and 14000 probably due to the conversion of a sb1 to a zend_ulong)
Sebastian Bergmann [Thu, 20 Sep 2018 16:01:34 +0000 (12:01 -0400)]
Fix
Sebastian Bergmann [Thu, 20 Sep 2018 15:53:27 +0000 (11:53 -0400)]
Fix
Valentin Collet [Thu, 20 Sep 2018 13:13:36 +0000 (15:13 +0200)]
fixing comments
Valentin Collet [Thu, 20 Sep 2018 10:17:06 +0000 (12:17 +0200)]
Update oci_statement.c
Letargie [Thu, 20 Sep 2018 10:03:57 +0000 (12:03 +0200)]
Add the PDOStatement::getColumnMeta() function to the pdo_oci driver
Dmitry Stogov [Thu, 20 Sep 2018 09:34:31 +0000 (12:34 +0300)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76711 (OPcache enabled triggers false-positive "Illegal string offset")
Dmitry Stogov [Thu, 20 Sep 2018 09:33:46 +0000 (12:33 +0300)]
Fixed bug #76711 (OPcache enabled triggers false-positive "Illegal string offset")
Christoph M. Becker [Wed, 19 Sep 2018 18:01:04 +0000 (20:01 +0200)]
Update to SQLite 3.25.1
Dmitry Stogov [Wed, 19 Sep 2018 15:09:32 +0000 (18:09 +0300)]
Use macro
Dmitry Stogov [Wed, 19 Sep 2018 14:53:10 +0000 (17:53 +0300)]
Improved hash copying
Dmitry Stogov [Wed, 19 Sep 2018 11:43:17 +0000 (14:43 +0300)]
Drop unused variable
Dmitry Stogov [Wed, 19 Sep 2018 10:55:53 +0000 (13:55 +0300)]
Turn zend_hash_exists() into inline function
Dmitry Stogov [Wed, 19 Sep 2018 10:55:27 +0000 (13:55 +0300)]
Use zend_hash_find() instead of zend_hash_exists()
Dmitry Stogov [Wed, 19 Sep 2018 10:54:37 +0000 (13:54 +0300)]
Micro-optimization
Dmitry Stogov [Wed, 19 Sep 2018 10:54:02 +0000 (13:54 +0300)]
Remove zend_hash_exists()
Nikita Popov [Wed, 19 Sep 2018 10:32:03 +0000 (12:32 +0200)]
Merge branch 'PHP-7.3'