granicus.if.org Git

]> granicus.if.org Git - php/log

Anatol Belski [Thu, 24 Nov 2016 13:48:33 +0000 (14:48 +0100)]

more fileinfo test fixes

Note the behavior change, FILEINFO_CONTINUE will now always
append a string \012-. I'm leaving this as is for now, as this is
the behavior change in libmagic.

commit | commitdiff | tree

Anatol Belski [Thu, 24 Nov 2016 13:36:49 +0000 (14:36 +0100)]

fix tests

commit | commitdiff | tree

Anatol Belski [Tue, 25 Oct 2016 16:51:05 +0000 (18:51 +0200)]

Upgraded libmagic to 5.29

yet unfinished port to libmagic 5.28

catch with missing libmagic port pieces

regenerate data file with magic from 5.28

test magic files from 5.28

missing files

fix path

pure c99 is still not supported

move right to 5.29, yet some bugs present

more sync with orig lib

more ZMM usage

use unpatched data for now

partial revert according to bug #67705

Revert "more ZMM usage"

This reverts commit 5e3c9b851034b455942b219b18bdc49c8315c3ee.

several fixes, so it's now closer to the clean port

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:17 +0000 (10:40 +0000)]

Updated to version 2016.10 (2016j)

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:16 +0000 (10:40 +0000)]

Empty merge

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:15 +0000 (10:40 +0000)]

Updated to version 2016.10 (2016j)

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:15 +0000 (10:40 +0000)]

Empty merge

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:14 +0000 (10:40 +0000)]

Updated to version 2016.10 (2016j)

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:13 +0000 (10:40 +0000)]

Empty merge

commit | commitdiff | tree

Derick Rethans [Thu, 24 Nov 2016 10:40:11 +0000 (10:40 +0000)]

Updated to version 2016.10 (2016j)

commit | commitdiff | tree

Xinchen Hui [Thu, 24 Nov 2016 04:05:07 +0000 (12:05 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Update NEWS
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)

commit | commitdiff | tree

Xinchen Hui [Thu, 24 Nov 2016 04:04:03 +0000 (12:04 +0800)]

Update NEWS

commit | commitdiff | tree

Xinchen Hui [Thu, 24 Nov 2016 04:03:23 +0000 (12:03 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)

commit | commitdiff | tree

Xinchen Hui [Thu, 24 Nov 2016 04:02:02 +0000 (12:02 +0800)]

Fixed bug #73585 (Logging of "Internal Zend error - Missing class information" missing class name)

Actually, I doubt how thing bug could be triggered

commit | commitdiff | tree

Ferenc Kovacs [Thu, 24 Nov 2016 00:59:40 +0000 (01:59 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Ferenc Kovacs [Thu, 24 Nov 2016 00:58:46 +0000 (01:58 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Ferenc Kovacs [Thu, 24 Nov 2016 00:57:42 +0000 (01:57 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Ferenc Kovacs [Thu, 24 Nov 2016 00:54:23 +0000 (01:54 +0100)]

5.6.30 will be next

commit | commitdiff | tree

Remi Collet [Wed, 23 Nov 2016 13:56:50 +0000 (14:56 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
CS (no leading space in comment for config option)

commit | commitdiff | tree

Remi Collet [Wed, 23 Nov 2016 13:56:39 +0000 (14:56 +0100)]

CS (no leading space in comment for config option)

commit | commitdiff | tree

Xinchen Hui [Wed, 23 Nov 2016 06:27:57 +0000 (14:27 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)

commit | commitdiff | tree

Xinchen Hui [Wed, 23 Nov 2016 06:24:46 +0000 (14:24 +0800)]

Fixed bug #73583 (Segfaults when conditionally declared class and function have the same name)

bug was introduced in rev 88eae43f , and the runtime defined key is not
merged-able

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 21:46:34 +0000 (22:46 +0100)]

Fix test

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 20:01:15 +0000 (21:01 +0100)]

Fix foreach object property visibility checks

Again, check_property_access() does not correctly work for properties
that look like mangled private propert names (but aren't). Fix this
by only checking visibility for INDIRECT properties.

foreach currently still unmangles property names, even if they don't
correspond to declared properties. HHVM does not do this (and I think
this is correct.) As this is done consistently, leaving it alone
for now.

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 19:49:12 +0000 (20:49 +0100)]

Fix get_class_vars() fast-path/slow-path discrepancies

Normalize to the fast-path behavior. In particular, make sure that
the the property visibility check is correct for property names that
are formatted like mangled private properties (but are not). This is
done by only calling zend_check_property_access() for INDIRECT
properties.

commit | commitdiff | tree

Craig Duncan [Sun, 20 Nov 2016 16:40:37 +0000 (16:40 +0000)]

Use UTC instead of unavailable timezone in test

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 18:26:27 +0000 (19:26 +0100)]

Merge branch 'PHP-7.1'

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 18:25:53 +0000 (19:25 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 18:25:31 +0000 (19:25 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

commit | commitdiff | tree

Nikita Popov [Fri, 18 Nov 2016 15:41:13 +0000 (16:41 +0100)]

Make php_url_parse_ex() respect length argument

This should fix all out-of-bounds reads that could previously
occur if the string passed to php_url_parse_ex() is not NUL
terminated.

commit | commitdiff | tree

Nikita Popov [Fri, 18 Nov 2016 16:00:56 +0000 (17:00 +0100)]

Cleanup parse_url() query/fragment handling

The query/fragment handling was pretty convoluted, with many parts
being duplicated. Simplify by checking for fragment, then for query,
then for path.

commit | commitdiff | tree

Nikita Popov [Thu, 17 Nov 2016 22:18:05 +0000 (23:18 +0100)]

Cleanup parse_url() gotos

Simplify some unnecessarily complicated code. In particular the
length updates are unnecessary (length is only used at the very
start) and we're goto'ing around a bit too much.

commit | commitdiff | tree

Nikita Popov [Tue, 22 Nov 2016 18:06:59 +0000 (19:06 +0100)]

Fix ext/ftp

commit | commitdiff | tree

Tom Van Looy [Tue, 22 Nov 2016 16:34:26 +0000 (17:34 +0100)]

Fix two tests

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 15:36:27 +0000 (18:36 +0300)]

Export zend_do_fcall_overloaded()

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:44:56 +0000 (12:44 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update libs_versions.txt
update libs versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:44:06 +0000 (12:44 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update libs_versions.txt
update libs versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:42:57 +0000 (12:42 +0100)]

update libs_versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:42:20 +0000 (12:42 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update libs versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 11:36:51 +0000 (12:36 +0100)]

update libs versions.txt

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 10:57:26 +0000 (11:57 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
move dev to next

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 10:56:16 +0000 (11:56 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
move dev to next

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 10:49:09 +0000 (11:49 +0100)]

move dev to next

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 10:29:11 +0000 (13:29 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed use after free

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 10:28:49 +0000 (13:28 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed use after free

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 10:28:27 +0000 (13:28 +0300)]

Fixed use after free

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 09:07:06 +0000 (12:07 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Micro-optimization

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 09:06:39 +0000 (12:06 +0300)]

Micro-optimization

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:51:42 +0000 (11:51 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Removed useless (double) checks for EG(exception). (Bob)

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:50:48 +0000 (11:50 +0300)]

Removed useless (double) checks for EG(exception). (Bob)

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:23:17 +0000 (11:23 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed memory leak (Bob)

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:22:55 +0000 (11:22 +0300)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fixed memory leak (Bob)

commit | commitdiff | tree

Dmitry Stogov [Tue, 22 Nov 2016 08:22:10 +0000 (11:22 +0300)]

Fixed memory leak (Bob)

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 02:00:44 +0000 (03:00 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Revert "fix invalid read, follow up on 97b65cc9"

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:59:17 +0000 (02:59 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Revert "fix invalid read, follow up on 97b65cc9"

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:52:23 +0000 (02:52 +0100)]

Revert "fix invalid read, follow up on 97b65cc9"

This reverts commit b52fa5882a276c9397d108cd690721a006acd827.

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:31:43 +0000 (02:31 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix invalid read, follow up on 97b65cc9

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:30:16 +0000 (02:30 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
fix invalid read, follow up on 97b65cc9

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 01:28:45 +0000 (02:28 +0100)]

fix invalid read, follow up on 97b65cc9

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 00:02:04 +0000 (01:02 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS
  update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 00:01:18 +0000 (01:01 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 22 Nov 2016 00:01:00 +0000 (01:01 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:59:40 +0000 (00:59 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:59:07 +0000 (00:59 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:57:18 +0000 (00:57 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:47:30 +0000 (00:47 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fix bug #73498
Add a test for bug 73498

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:46:54 +0000 (00:46 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Fix bug #73498
Add a test for bug 73498

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:46:03 +0000 (00:46 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
Fix bug #73498
Add a test for bug 73498

commit | commitdiff | tree

Craig Duncan [Sun, 20 Nov 2016 20:48:21 +0000 (20:48 +0000)]

Fix bug #73498

Postgres uses the DELIMITER keyword since 7.3
And WITH is no longer required/used

commit | commitdiff | tree

Craig Duncan [Mon, 21 Nov 2016 19:49:18 +0000 (19:49 +0000)]

Add a test for bug 73498

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:33:29 +0000 (00:33 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
remove TSRMLS_*

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 23:32:42 +0000 (00:32 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
remove TSRMLS_*

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 22:53:37 +0000 (23:53 +0100)]

remove TSRMLS_*

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:59:59 +0000 (22:59 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update php.ini-* for bug #69090
update php.ini-* according to changes for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:59:30 +0000 (22:59 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update php.ini-* for bug #69090
update php.ini-* according to changes for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:58:23 +0000 (22:58 +0100)]

update php.ini-* for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:56:46 +0000 (22:56 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update php.ini-* according to changes for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 21:52:03 +0000 (22:52 +0100)]

update php.ini-* according to changes for bug #69090

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 19:01:51 +0000 (20:01 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS
  update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 19:01:07 +0000 (20:01 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 19:00:39 +0000 (20:00 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
update NEWS
update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 18:59:30 +0000 (19:59 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 18:58:54 +0000 (19:58 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 18:56:09 +0000 (19:56 +0100)]

update NEWS

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:32:38 +0000 (15:32 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
add test for bug #73452
Backport 15ac4904 to 5.6

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:31:34 +0000 (15:31 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
add test for bug #73452
Backport 15ac4904 to 5.6

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:29:44 +0000 (15:29 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
add test for bug #73452
Backport 15ac4904 to 5.6

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:25:46 +0000 (15:25 +0100)]

add test for bug #73452

commit | commitdiff | tree

Kalle Sommer Nielsen [Mon, 21 Nov 2016 14:22:30 +0000 (15:22 +0100)]

Remove more NetWare leftovers

commit | commitdiff | tree

Anatol Belski [Mon, 21 Nov 2016 14:20:03 +0000 (15:20 +0100)]

Backport 15ac4904 to 5.6

commit | commitdiff | tree

Kalle Sommer Nielsen [Mon, 21 Nov 2016 14:19:29 +0000 (15:19 +0100)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Kalle Sommer Nielsen [Mon, 21 Nov 2016 14:18:55 +0000 (15:18 +0100)]

Remove this old obsolete code

commit | commitdiff | tree

Dmitry Stogov [Mon, 21 Nov 2016 10:13:28 +0000 (13:13 +0300)]

Turn function into inline

commit | commitdiff | tree

Dmitry Stogov [Mon, 21 Nov 2016 07:39:38 +0000 (10:39 +0300)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Regenerated files

commit | commitdiff | tree

Dmitry Stogov [Mon, 21 Nov 2016 07:38:08 +0000 (10:38 +0300)]

Regenerated files

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:46:50 +0000 (11:46 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Update NEWs

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:46:37 +0000 (11:46 +0800)]

Update NEWs

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:46:13 +0000 (11:46 +0800)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Update NEWS
Fix memory leak(null coalescing operator with Spl hash)

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:46:03 +0000 (11:46 +0800)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Update NEWS
Fix memory leak(null coalescing operator with Spl hash)

commit | commitdiff | tree

Xinchen Hui [Mon, 21 Nov 2016 03:45:49 +0000 (11:45 +0800)]

Update NEWS

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom