]>
granicus.if.org Git - php/log
Nikita Popov [Sat, 9 Jan 2016 12:28:16 +0000 (13:28 +0100)]
Use worklist for DFG construction
About 40x faster.
Anatol Belski [Mon, 11 Jan 2016 20:45:42 +0000 (21:45 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Simplify code per Anatol.
Insert bug number.
Use strtoll() when apr_off_t is 64 bits.
Anatol Belski [Mon, 11 Jan 2016 20:44:23 +0000 (21:44 +0100)]
update NEWS
Anatol Belski [Mon, 11 Jan 2016 20:43:52 +0000 (21:43 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Mon, 11 Jan 2016 20:42:31 +0000 (21:42 +0100)]
update NEWS
Anatol Belski [Mon, 11 Jan 2016 20:39:31 +0000 (21:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Simplify code per Anatol.
Insert bug number.
Use strtoll() when apr_off_t is 64 bits.
Adam Harvey [Sun, 8 Nov 2015 15:35:49 +0000 (16:35 +0100)]
Simplify code per Anatol.
Adam Harvey [Sun, 8 Nov 2015 14:15:46 +0000 (15:15 +0100)]
Insert bug number.
Adam Harvey [Sun, 8 Nov 2015 14:05:22 +0000 (15:05 +0100)]
Use strtoll() when apr_off_t is 64 bits.
Anatol Belski [Mon, 11 Jan 2016 20:29:44 +0000 (21:29 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
patch for github PR #1695
fix out format
Anatol Belski [Mon, 11 Jan 2016 20:14:16 +0000 (21:14 +0100)]
update NEWS
Thomas Punt [Mon, 11 Jan 2016 20:11:55 +0000 (21:11 +0100)]
patch for github PR #1695
Anatol Belski [Mon, 11 Jan 2016 12:37:30 +0000 (13:37 +0100)]
fix out format
Anatol Belski [Mon, 11 Jan 2016 19:42:56 +0000 (20:42 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
backport
9a07245b728714de09361ea16b9c6fcf70cb5685 from 7.0
Anatol Belski [Mon, 11 Jan 2016 19:42:20 +0000 (20:42 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Mon, 11 Jan 2016 19:41:29 +0000 (20:41 +0100)]
update NEWS
Anatol Belski [Mon, 11 Jan 2016 19:39:52 +0000 (20:39 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
backport
9a07245b728714de09361ea16b9c6fcf70cb5685 from 7.0
Anatol Belski [Mon, 11 Jan 2016 19:37:46 +0000 (20:37 +0100)]
Anatol Belski [Mon, 11 Jan 2016 11:17:21 +0000 (12:17 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Align NEWS entry format
Anatol Belski [Mon, 11 Jan 2016 11:16:41 +0000 (12:16 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Align NEWS entry format
Anatol Belski [Mon, 11 Jan 2016 10:59:48 +0000 (11:59 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
further datatype and range check fixes for ibase
datatype fixes
fix typo for #ifdef
Fix various bugs in interbase
Anatol Belski [Mon, 11 Jan 2016 08:46:53 +0000 (09:46 +0100)]
further datatype and range check fixes for ibase
Anatol Belski [Mon, 11 Jan 2016 07:52:54 +0000 (08:52 +0100)]
datatype fixes
Anatol Belski [Mon, 11 Jan 2016 07:37:16 +0000 (08:37 +0100)]
fix typo for #ifdef
Xinchen Hui [Fri, 8 Jan 2016 03:19:32 +0000 (11:19 +0800)]
Fix various bugs in interbase
Also read: https://marc.info/?l=php-internals&m=
145077389117375&w=2
Lior Kaplan [Sat, 9 Jan 2016 17:10:01 +0000 (19:10 +0200)]
Align NEWS entry format
Andrea Faulds [Fri, 8 Jan 2016 17:21:59 +0000 (17:21 +0000)]
Merge branch 'PHP-7.0'
Andrea Faulds [Fri, 8 Jan 2016 17:20:52 +0000 (17:20 +0000)]
Fix bug #71314
Anatol Belski [Fri, 8 Jan 2016 07:36:43 +0000 (08:36 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update libs_versions.txt
update libs versions
Anatol Belski [Fri, 8 Jan 2016 07:36:21 +0000 (08:36 +0100)]
update libs_versions.txt
Anatol Belski [Fri, 8 Jan 2016 07:35:17 +0000 (08:35 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs versions
Anatol Belski [Fri, 8 Jan 2016 07:33:55 +0000 (08:33 +0100)]
update libs versions
Anatol Belski [Fri, 8 Jan 2016 07:08:45 +0000 (08:08 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
allow static build of ext/ftp
update NEWS
Fixed bug #71227 Can't compile php_curl statically
Anatol Belski [Fri, 8 Jan 2016 07:07:15 +0000 (08:07 +0100)]
allow static build of ext/ftp
Nikita Popov [Thu, 7 Jan 2016 22:48:41 +0000 (23:48 +0100)]
Fix bitset initialization
Anatol Belski [Thu, 7 Jan 2016 17:55:05 +0000 (18:55 +0100)]
Fixed bug #71227 Can't compile php_curl statically
Anatol Belski [Thu, 7 Jan 2016 17:56:53 +0000 (18:56 +0100)]
update NEWS
Anatol Belski [Thu, 7 Jan 2016 17:55:05 +0000 (18:55 +0100)]
Fixed bug #71227 Can't compile php_curl statically
Nikita Popov [Thu, 7 Jan 2016 17:47:18 +0000 (18:47 +0100)]
Fix CE fetching for NEW object type inference
Create a common function for getting a class entry.
Nikita Popov [Sat, 2 Jan 2016 18:33:38 +0000 (19:33 +0100)]
Range&type inference for JMP_SET
Anatol Belski [Thu, 7 Jan 2016 16:58:44 +0000 (17:58 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
more informative error message for opcache fallback
add SKIPIF condition
Anatol Belski [Thu, 7 Jan 2016 16:57:41 +0000 (17:57 +0100)]
more informative error message for opcache fallback
Anatol Belski [Wed, 6 Jan 2016 09:01:40 +0000 (10:01 +0100)]
add SKIPIF condition
Xinchen Hui [Thu, 7 Jan 2016 15:05:31 +0000 (07:05 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Thu, 7 Jan 2016 15:05:17 +0000 (07:05 -0800)]
Fixed bug #71300 (Segfault in zend_fetch_string_offset)
Bob Weinand [Thu, 7 Jan 2016 14:13:07 +0000 (15:13 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Thu, 7 Jan 2016 14:12:35 +0000 (15:12 +0100)]
Fix accidental zval_dtor() usage
Julien Pauli [Thu, 7 Jan 2016 12:55:50 +0000 (13:55 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
5.5.32 now
Julien Pauli [Thu, 7 Jan 2016 12:55:42 +0000 (13:55 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
5.5.32 now
Julien Pauli [Thu, 7 Jan 2016 12:55:09 +0000 (13:55 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.32 now
Conflicts:
configure.in
main/php_version.h
Julien Pauli [Thu, 7 Jan 2016 12:04:35 +0000 (13:04 +0100)]
5.5.32 now
Julien Pauli [Thu, 7 Jan 2016 12:06:21 +0000 (13:06 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
5.5.32 now
Julien Pauli [Thu, 7 Jan 2016 12:05:57 +0000 (13:05 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
5.5.32 now
Julien Pauli [Thu, 7 Jan 2016 12:05:38 +0000 (13:05 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.5.32 now
Conflicts:
configure.in
main/php_version.h
Julien Pauli [Thu, 7 Jan 2016 12:04:35 +0000 (13:04 +0100)]
5.5.32 now
Bob Weinand [Thu, 7 Jan 2016 10:56:51 +0000 (11:56 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Thu, 7 Jan 2016 10:56:10 +0000 (11:56 +0100)]
Fixed bug #71297 (Memory leak with yield from)
Ferenc Kovacs [Wed, 6 Jan 2016 14:55:36 +0000 (15:55 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
adjust release date for the delay
Ferenc Kovacs [Wed, 6 Jan 2016 14:55:17 +0000 (15:55 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
adjust release date for the delay
Ferenc Kovacs [Wed, 6 Jan 2016 14:54:55 +0000 (15:54 +0100)]
adjust release date for the delay
Ferenc Kovacs [Wed, 6 Jan 2016 14:50:10 +0000 (15:50 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
these will be part of 5.6.17 not 5.6.18
Removed unecessary string dup
Moved buffer from heap to stack
Ferenc Kovacs [Wed, 6 Jan 2016 14:49:06 +0000 (15:49 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
these will be part of 5.6.17 not 5.6.18
Removed unecessary string dup
Moved buffer from heap to stack
Ferenc Kovacs [Wed, 6 Jan 2016 14:23:18 +0000 (15:23 +0100)]
these will be part of 5.6.17 not 5.6.18
Julien Pauli [Wed, 6 Jan 2016 10:41:50 +0000 (11:41 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Moved buffer from heap to stack
Julien Pauli [Mon, 4 Jan 2016 13:46:57 +0000 (14:46 +0100)]
Moved buffer from heap to stack
Julien Pauli [Mon, 4 Jan 2016 14:04:05 +0000 (15:04 +0100)]
Removed unecessary string dup
Julien Pauli [Mon, 4 Jan 2016 13:46:57 +0000 (14:46 +0100)]
Moved buffer from heap to stack
Anatol Belski [Wed, 6 Jan 2016 06:53:50 +0000 (07:53 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
updated NEWS
Patch for Heap Buffer Overflow in EscapeShell
Anatol Belski [Wed, 6 Jan 2016 06:53:31 +0000 (07:53 +0100)]
updated NEWS
libnex [Sun, 3 Jan 2016 23:27:27 +0000 (12:27 +1300)]
Patch for Heap Buffer Overflow in EscapeShell
Proposed patch for bug #71270
Anatol Belski [Wed, 6 Jan 2016 06:46:10 +0000 (07:46 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
set release date
fix NEWS and add some 7.0.2 entries
Anatol Belski [Wed, 6 Jan 2016 06:45:03 +0000 (07:45 +0100)]
set release date
Anatol Belski [Wed, 6 Jan 2016 06:44:26 +0000 (07:44 +0100)]
fix NEWS and add some 7.0.2 entries
Anatol Belski [Wed, 6 Jan 2016 05:10:39 +0000 (06:10 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Update NEWS
add NEWS entries for 7.0.2
re-apply the patch from
1785d2b805f64eaaacf98c14c9e13107bf085ab1
Improve fix for bug #70976
Fix bug #70976: fix boundary check on gdImageRotateInterpolated
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
fix merge mistake
Fixed #70728
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
Fix bug #70976: fix boundary check on gdImageRotateInterpolated
typofix
Anatol Belski [Wed, 6 Jan 2016 05:09:12 +0000 (06:09 +0100)]
Merge remote-tracking branch 'phpsec/PHP-7.0' into PHP-7.0
* phpsec/PHP-7.0:
add NEWS entries for 7.0.2
re-apply the patch from
1785d2b805f64eaaacf98c14c9e13107bf085ab1
Improve fix for bug #70976
Fix bug #70976: fix boundary check on gdImageRotateInterpolated
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
fix merge mistake
Fixed #70728
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Anatol Belski [Wed, 6 Jan 2016 05:08:46 +0000 (06:08 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6' into PHP-7.0
* origin/PHP-5.6:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
Fix bug #70976: fix boundary check on gdImageRotateInterpolated
typofix
Stanislav Malyshev [Wed, 6 Jan 2016 03:37:29 +0000 (19:37 -0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
Improve fix for bug #70976
Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
Fixed #70728
Fixed bug #70755: fpm_log.c memory leak and buffer overflow
Fix bug #70976: fix boundary check on gdImageRotateInterpolated
typofix
Stanislav Malyshev [Wed, 6 Jan 2016 03:28:24 +0000 (19:28 -0800)]
Update NEWS
Xinchen Hui [Tue, 5 Jan 2016 16:03:37 +0000 (00:03 +0800)]
Merge branch 'master' of git.php.net:/php-src
Anatol Belski [Tue, 5 Jan 2016 19:04:18 +0000 (20:04 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
improve fix for bug #71273
Anatol Belski [Tue, 5 Jan 2016 19:03:05 +0000 (20:03 +0100)]
improve fix for bug #71273
Anatol Belski [Tue, 5 Jan 2016 17:58:02 +0000 (18:58 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Tue, 5 Jan 2016 17:57:38 +0000 (18:57 +0100)]
update NEWS
Anatol Belski [Tue, 5 Jan 2016 17:56:12 +0000 (18:56 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash
Anatol Belski [Tue, 5 Jan 2016 17:53:04 +0000 (18:53 +0100)]
Fixed bug #71273 A wrong ext directory setup in php.ini leads to crash
Xinchen Hui [Tue, 5 Jan 2016 16:03:01 +0000 (00:03 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 5 Jan 2016 16:02:53 +0000 (00:02 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
George Wang [Thu, 19 Nov 2015 22:01:26 +0000 (17:01 -0500)]
Fixed runtime php.ini override, ini name length is off by 1.
(cherry picked from commit
5bcb7a7019a49c2f80eda7d2aa947efebeee0034)
Xinchen Hui [Tue, 5 Jan 2016 16:01:56 +0000 (00:01 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 5 Jan 2016 16:01:44 +0000 (00:01 +0800)]
Fixed bug #71287 (Error message contains hexadecimal instead of decimal number)
Andrey Hristov [Tue, 5 Jan 2016 15:28:33 +0000 (16:28 +0100)]
Fix reloc for the allocator. Original files and lines were not showing
correct. This seems to be a PHP7 issue.
Bob Weinand [Tue, 5 Jan 2016 15:28:23 +0000 (16:28 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Tue, 5 Jan 2016 15:27:18 +0000 (16:27 +0100)]
Fixed bug #71275 (Bad method called on cloning an object having a trait)
Xinchen Hui [Tue, 5 Jan 2016 15:02:55 +0000 (23:02 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 5 Jan 2016 15:02:17 +0000 (23:02 +0800)]
Fixed bug #71280 (ibase_blob_add() expects parameter 2 to be resorce)
Andrey Hristov [Tue, 5 Jan 2016 12:19:32 +0000 (13:19 +0100)]
Fix typo that was unhiding only with USE_ZEND_ALLOC
Anatol Belski [Tue, 5 Jan 2016 12:06:00 +0000 (13:06 +0100)]
add NEWS entries for 7.0.2
Julien Pauli [Mon, 4 Jan 2016 17:14:08 +0000 (18:14 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Happy new year (Update copyright to 2016)
Julien Pauli [Mon, 4 Jan 2016 17:13:38 +0000 (18:13 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Happy new year (Update copyright to 2016)
Conflicts:
ext/json/php_json_encoder.h
sapi/continuity/capi.c
Jakub Zelenka [Mon, 4 Jan 2016 16:53:30 +0000 (16:53 +0000)]
Merge branch 'PHP-7.0'
projects / php / log