]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 15 Mar 2017 18:50:26 +0000 (19:50 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 15 Mar 2017 18:06:34 +0000 (19:06 +0100)]
Fix bug #69676
Anatol Belski [Wed, 15 Mar 2017 11:34:36 +0000 (12:34 +0100)]
Use zend_test shared for tests
The snapshot build enables everything it could find. The test run will
load all the shared exts as well, until defined otherwise. So no needs
for an extra action.
Anatol Belski [Wed, 15 Mar 2017 10:43:20 +0000 (11:43 +0100)]
fix shared compilation
Bob Weinand [Tue, 14 Mar 2017 23:09:59 +0000 (00:09 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Tue, 14 Mar 2017 23:09:42 +0000 (00:09 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Matt Bonneau [Mon, 13 Mar 2017 04:11:30 +0000 (00:11 -0400)]
Fixed bug #74240 (deflate_add can allocate too much memory)
Bob Weinand [Tue, 14 Mar 2017 21:17:23 +0000 (22:17 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Tue, 14 Mar 2017 21:17:10 +0000 (22:17 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Tue, 14 Mar 2017 21:15:41 +0000 (22:15 +0100)]
Fix stream context changes leaking into copies of previous context
Jakub Zelenka [Tue, 14 Mar 2017 18:47:51 +0000 (18:47 +0000)]
Merge branch 'PHP-7.1'
Jakub Zelenka [Tue, 14 Mar 2017 18:46:29 +0000 (18:46 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Tue, 14 Mar 2017 18:43:39 +0000 (18:43 +0000)]
Merge branch 'bug72333' into PHP-7.0
Jakub Zelenka [Tue, 14 Mar 2017 18:41:23 +0000 (18:41 +0000)]
Replace NEWS entry for #74159 with #72333
The #74159 is duplicate
Sara Golemon [Tue, 14 Mar 2017 18:29:22 +0000 (11:29 -0700)]
Remove unnecesary shadow of new_val
Sara Golemon [Tue, 14 Mar 2017 17:30:49 +0000 (10:30 -0700)]
Minor optimizations to array_keys()/array_values()
array_values():
When the input is an empty array or a packed array with no gaps,
return the original array.
array_keys():
When the input is an empty array, return the original array.
When the input is a packed array with no holes
(and no search key specified), populate the return with
a simple range(0, count($input) - 1)
Jakub Zelenka [Mon, 13 Mar 2017 21:05:09 +0000 (21:05 +0000)]
Skip bug74159 test for OpenSSL lower than 1.0.1
Jakub Zelenka [Sat, 11 Mar 2017 19:38:26 +0000 (19:38 +0000)]
Tidy up test for bug72333
Jakub Zelenka [Wed, 8 Mar 2017 19:49:39 +0000 (19:49 +0000)]
Speed up test for bug72333
It reliably fails without the xp_ssl.c so it is good with smaller usleep
Jakub Zelenka [Wed, 8 Mar 2017 19:38:54 +0000 (19:38 +0000)]
Fix indent and add comment
Jakub Zelenka [Wed, 8 Mar 2017 19:30:02 +0000 (19:30 +0000)]
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
Jakub Zelenka [Mon, 6 Mar 2017 19:43:25 +0000 (19:43 +0000)]
Remove extra SSL mode settings
Jakub Zelenka [Sun, 22 Jan 2017 20:44:29 +0000 (20:44 +0000)]
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
Nikita Popov [Tue, 14 Mar 2017 11:06:58 +0000 (12:06 +0100)]
Fix SKIPIF conditions
Nikita Popov [Sun, 12 Mar 2017 16:19:20 +0000 (17:19 +0100)]
Drop unnecessary allocator return value checks
Anatol Belski [Mon, 13 Mar 2017 11:33:51 +0000 (12:33 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update binary sdk tools version for appveyor
Anatol Belski [Mon, 13 Mar 2017 11:32:46 +0000 (12:32 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update binary sdk tools version for appveyor
Anatol Belski [Mon, 13 Mar 2017 11:31:31 +0000 (12:31 +0100)]
update binary sdk tools version for appveyor
Remi Collet [Mon, 13 Mar 2017 07:17:59 +0000 (08:17 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
rely on provided openssl.cnf to avoid possible failure with system defaults
Remi Collet [Mon, 13 Mar 2017 07:17:42 +0000 (08:17 +0100)]
rely on provided openssl.cnf to avoid possible failure with system defaults
Nikita Popov [Sun, 12 Mar 2017 21:15:46 +0000 (22:15 +0100)]
Fix __sleep() returning undefined declared properties
Nikita Popov [Sun, 12 Mar 2017 20:32:47 +0000 (21:32 +0100)]
Clean up __sleep() related code
Joe Watkins [Sun, 12 Mar 2017 19:00:06 +0000 (19:00 +0000)]
Merge branch 'pull-request/2414'
* pull-request/2414:
zend-test extension to house code that is required for testing internal APIs, but that we would not want to expose for regular builds
Nikita Popov [Fri, 10 Mar 2017 23:33:32 +0000 (00:33 +0100)]
zend-test extension to house code that is required for testing internal APIs, but that we would not want to expose for regular builds
David Carlier [Sat, 11 Mar 2017 23:50:50 +0000 (23:50 +0000)]
Drop unnecessary checks of pemalloc() return value
Nikita Popov [Sun, 12 Mar 2017 16:04:02 +0000 (17:04 +0100)]
Merge branch 'PHP-7.1'
andrewnester [Fri, 10 Mar 2017 17:34:23 +0000 (20:34 +0300)]
Implement FR #74217: deterministic sqlite functions
Nikita Popov [Fri, 10 Mar 2017 17:21:09 +0000 (18:21 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 10 Mar 2017 17:20:49 +0000 (18:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 9 Mar 2017 20:09:36 +0000 (21:09 +0100)]
Fixed bug #73960
Remi Collet [Fri, 10 Mar 2017 10:52:26 +0000 (11:52 +0100)]
Constify to void build warning for C++ ext. [-Wwrite-strings]
Example (with v8js):
/builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc: In function 'void v8js_execute_script(zval*, v8js_script*, long int, long int, long int, zval**)':
/usr/include/php/Zend/zend.h:204:57: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]
#define zend_bailout() _zend_bailout(__FILE__, __LINE__)
^
/builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc:633:3: note: in expansion of macro 'zend_bailout'
zend_bailout();
^~~~~~~~~~~~
Xinchen Hui [Fri, 10 Mar 2017 07:17:29 +0000 (15:17 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74218 (ArrayIterator error message is confusing)
Xinchen Hui [Fri, 10 Mar 2017 07:16:01 +0000 (15:16 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74218 (ArrayIterator error message is confusing)
Xinchen Hui [Fri, 10 Mar 2017 07:15:31 +0000 (15:15 +0800)]
Fixed bug #74218 (ArrayIterator error message is confusing)
Sara Golemon [Thu, 9 Mar 2017 19:58:19 +0000 (11:58 -0800)]
Merge branch 'PHP-7.1'
Sara Golemon [Thu, 9 Mar 2017 19:56:54 +0000 (11:56 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add NEWS entry for
bab0b99f
Sara Golemon [Thu, 9 Mar 2017 19:47:29 +0000 (11:47 -0800)]
Add NEWS entry for
bab0b99f
Nikita Popov [Thu, 9 Mar 2017 19:48:32 +0000 (20:48 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 9 Mar 2017 19:48:14 +0000 (20:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 9 Mar 2017 19:47:06 +0000 (20:47 +0100)]
Fixed bug #73370
If len=0 malloc() is allowed to return NULL.
Nikita Popov [Thu, 9 Mar 2017 16:32:08 +0000 (17:32 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 9 Mar 2017 16:31:52 +0000 (17:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Thomas Orozco [Thu, 9 Jun 2016 08:45:40 +0000 (10:45 +0200)]
Fixed bug #71003: Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
Nikita Popov [Thu, 9 Mar 2017 15:45:40 +0000 (16:45 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 9 Mar 2017 15:44:25 +0000 (16:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
mcq8 [Fri, 3 Jun 2016 19:28:20 +0000 (19:28 +0000)]
Fixed bug #72096 Swatch time value incorrect for dates before 1970
Nikita Popov [Thu, 9 Mar 2017 15:24:51 +0000 (16:24 +0100)]
Drop outdated makerpm script
Not updated since 2003, uses Copyright tag (not supported since
2005), uses a number of configure options that have been dropped
ages ago, etc.
Dennis Birkholz [Wed, 5 Aug 2015 14:42:42 +0000 (16:42 +0200)]
Pcntl: Make realtime signals available
Expose constants SIGRTMIN and SIGRTMAX and adjust range checks to
support realtime signals.
c9s [Wed, 4 May 2016 06:09:41 +0000 (14:09 +0800)]
Enable ccache on Travis
Joe Watkins [Thu, 9 Mar 2017 07:44:18 +0000 (07:44 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #74149 static embed SAPI linkage error
Joe Watkins [Thu, 9 Mar 2017 07:42:32 +0000 (07:42 +0000)]
Fix bug #74149 static embed SAPI linkage error
Nikita Popov [Wed, 8 Mar 2017 23:10:31 +0000 (00:10 +0100)]
Merge branch 'PHP-7.1'
andrewnester [Thu, 2 Mar 2017 13:59:32 +0000 (16:59 +0300)]
Fixed bug #74058
Fall back from get_property_ptr_ptr to read_property if offsetGet
is overridden.
Sara Golemon [Wed, 8 Mar 2017 18:00:59 +0000 (10:00 -0800)]
Try fallback on IPv4 ANYADDR when IPv6 ANYADDR fails
https://bugs.php.net/bug.php?id=74166
A host system with no/limited IPv6 support will fail at binding
the IPv6 ANYADDR address (::) as the address family is unsupported.
Deal with this by handling failure to implicitly bind to ::
as a soft failure, falling back to 0.0.0.0.
If binding to :: failed for some other reason (e.g. port in use)
then binding to 0.0.0.0 will likely fail as well, but we'll
get appropriate warnings for that.
Sara Golemon [Tue, 7 Mar 2017 20:11:31 +0000 (12:11 -0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Detect invalid port in xp_socket parse ip address
Sara Golemon [Tue, 7 Mar 2017 20:11:22 +0000 (12:11 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Detect invalid port in xp_socket parse ip address
Sara Golemon [Tue, 7 Mar 2017 19:27:46 +0000 (11:27 -0800)]
Detect invalid port in xp_socket parse ip address
For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)
However, with the introdcution of stream transports in PHP 4.3,
it became possible to include the port in the hostname specifier:
fsockopen('127.0.0.1:80')
Or more formally: fsockopen('tcp://127.0.0.1:80')
Confusing results when these two forms are combined, however.
fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting
to connect to '127.0.0.1:80:443' which any reasonable stack would
consider invalid.
Unfortunately, PHP parses the address looking for the first colon
(with special handling for IPv6, don't worry) and calls atoi()
from there. atoi() in turn, simply stops parsing at the first
non-numeric character and returns the value so far.
The end result is that the explicitly supplied port is treated
as ignored garbage, rather than producing an error.
This diff replaces atoi() with strtol() and inspects the
stop character. If additional "garbage" of any kind is found,
it fails and returns an error.
Anatol Belski [Tue, 7 Mar 2017 18:01:00 +0000 (19:01 +0100)]
move to hash API for interned strings ht management
Anatol Belski [Tue, 7 Mar 2017 14:42:19 +0000 (15:42 +0100)]
drop redundant checks
Anatol Belski [Tue, 7 Mar 2017 14:31:54 +0000 (15:31 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync with the incremental and inter-file analysis option
Anatol Belski [Tue, 7 Mar 2017 14:27:57 +0000 (15:27 +0100)]
sync with the incremental and inter-file analysis option
available as of cppcheck 1.77
Anatol Belski [Tue, 7 Mar 2017 12:29:37 +0000 (13:29 +0100)]
move to hash API
Nikita Popov [Tue, 7 Mar 2017 12:18:04 +0000 (13:18 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 7 Mar 2017 12:17:33 +0000 (13:17 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 7 Mar 2017 12:16:06 +0000 (13:16 +0100)]
Fix out of bounds access in gc_find_additional_buffer()
Dmitry Stogov [Tue, 7 Mar 2017 07:18:57 +0000 (10:18 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed pointer allignment
Dmitry Stogov [Tue, 7 Mar 2017 07:18:34 +0000 (10:18 +0300)]
Fixed pointer allignment
Dmitry Stogov [Tue, 7 Mar 2017 06:50:28 +0000 (09:50 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Ensure pointer alignment.
Dmitry Stogov [Mon, 6 Mar 2017 14:09:05 +0000 (17:09 +0300)]
Ensure pointer alignment.
Anatol Belski [Tue, 7 Mar 2017 00:33:19 +0000 (01:33 +0100)]
remove accidentially commited file
Anatol Belski [Tue, 7 Mar 2017 00:29:45 +0000 (01:29 +0100)]
extend ccppcheck defs
Dmitry Stogov [Mon, 6 Mar 2017 14:09:05 +0000 (17:09 +0300)]
Ensure pointer alignment.
Anatol Belski [Sat, 4 Mar 2017 09:39:13 +0000 (10:39 +0100)]
Interned strings unification for TS/NTS
Hereby, interned strings are supported in thread safe PHP. The patch
implements two types of interned strings
- interning per process, strings are not freed till process end
- interning per request, strings are freed at request end
There is no runtime interning.
With Opcache, all the permanent iterned strings are copied into SHM on
startup, additional copying into SHM might happen on demand.
Dmitry Stogov [Fri, 3 Mar 2017 13:13:03 +0000 (16:13 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
Dmitry Stogov [Fri, 3 Mar 2017 13:12:41 +0000 (16:12 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
Dmitry Stogov [Fri, 3 Mar 2017 13:10:46 +0000 (16:10 +0300)]
Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
Dmitry Stogov [Fri, 3 Mar 2017 09:26:49 +0000 (12:26 +0300)]
Fixed file-cache support (serialization/deserialization of zend_type)
Anatol Belski [Thu, 2 Mar 2017 19:47:56 +0000 (20:47 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync NEWS for bug #74159
Anatol Belski [Thu, 2 Mar 2017 19:46:39 +0000 (20:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync NEWS for bug #74159
Anatol Belski [Thu, 2 Mar 2017 19:45:15 +0000 (20:45 +0100)]
sync NEWS for bug #74159
Anatol Belski [Thu, 2 Mar 2017 19:36:12 +0000 (20:36 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
improve signal globals consistency check for TS
Anatol Belski [Thu, 2 Mar 2017 19:34:48 +0000 (20:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
improve signal globals consistency check for TS
Anatol Belski [Thu, 2 Mar 2017 19:27:27 +0000 (20:27 +0100)]
improve signal globals consistency check for TS
Seems when we receive TERM, TLS is destroyed completely. In that case,
not only signal globals, but the entire globals array doesn't exist
anymore.
Anatol Belski [Thu, 2 Mar 2017 15:43:10 +0000 (16:43 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
do not try to handle signals, when globals are inconsistent
Anatol Belski [Thu, 2 Mar 2017 15:41:43 +0000 (16:41 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
do not try to handle signals, when globals are inconsistent
Anatol Belski [Thu, 2 Mar 2017 15:39:32 +0000 (16:39 +0100)]
do not try to handle signals, when globals are inconsistent
Remi Collet [Thu, 2 Mar 2017 12:36:40 +0000 (13:36 +0100)]
Zip: add support for encrypted archive
Nikita Popov [Thu, 2 Mar 2017 11:36:31 +0000 (12:36 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 2 Mar 2017 11:36:04 +0000 (12:36 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
somedaysummer [Fri, 27 Jan 2017 20:20:07 +0000 (15:20 -0500)]
PHP bug #74004
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.