]>
granicus.if.org Git - php/log
Dmitry Stogov [Fri, 13 Mar 2015 18:10:09 +0000 (21:10 +0300)]
Use fastcall calling convention for most critical ZE subsystems.
Xinchen Hui [Fri, 13 Mar 2015 17:10:17 +0000 (01:10 +0800)]
Revert "Enable zend signals handler by default"
This reverts commit
dbe7ff6df5874a49b921424b523a0acbbf909773 .
Xinchen Hui [Fri, 13 Mar 2015 17:04:00 +0000 (01:04 +0800)]
Remove TSRMLS
Xinchen Hui [Fri, 13 Mar 2015 17:01:02 +0000 (01:01 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
ext/spl/spl_observer.c
Xinchen Hui [Fri, 13 Mar 2015 16:53:51 +0000 (00:53 +0800)]
Update NEWS
Xinchen Hui [Fri, 13 Mar 2015 16:53:32 +0000 (00:53 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Fri, 13 Mar 2015 16:52:53 +0000 (00:52 +0800)]
Little improvement, update NEWs, added test
Xinchen Hui [Fri, 13 Mar 2015 16:42:36 +0000 (00:42 +0800)]
Merge branch 'bug69227' of https://github.com/Vektah/php-src into PHP-5.5
Xinchen Hui [Fri, 13 Mar 2015 16:41:29 +0000 (00:41 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Fri, 13 Mar 2015 16:40:54 +0000 (00:40 +0800)]
Enable zend signals handler by default
Anatol Belski [Fri, 13 Mar 2015 10:09:52 +0000 (11:09 +0100)]
fixed test
Anatol Belski [Fri, 13 Mar 2015 08:40:17 +0000 (09:40 +0100)]
the test shouldn't fail when unlink failed
Nikita Popov [Fri, 13 Mar 2015 15:29:39 +0000 (16:29 +0100)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_generators.c
Zend/zend_generators.h
Nikita Popov [Fri, 13 Mar 2015 15:24:57 +0000 (16:24 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Wed, 11 Mar 2015 17:08:03 +0000 (18:08 +0100)]
Fixed bug #69221
A generator iterator can be created from different zvals - use
the object handle to manage references instead.
Dmitry Stogov [Fri, 13 Mar 2015 14:13:19 +0000 (17:13 +0300)]
Changed HashTable layout:
Removed HashTable->arHash (reduced memory consumption). Now hash slots may be accessed using HT_HASH() macro.
Hash slotas are allocated together with Buckets (before them) and lay in reverse order from HashTable->arData base address (see comments in Zend/zend_types.h)
Indexes in hash table and conflict resolution chains (Z_NEXT) may be stored as indeces or offsets in bytes, depending on system (32 or 64-bit).
HashTable data filelds are reordered to keep the most useful for zend_hash_find() data in the same CPU cache line.
Nikita Popov [Fri, 13 Mar 2015 13:14:01 +0000 (14:14 +0100)]
Regenerate ext/tokenizer data
Lior Kaplan [Fri, 13 Mar 2015 09:27:40 +0000 (11:27 +0200)]
Fix copyright years
Lior Kaplan [Fri, 13 Mar 2015 09:09:42 +0000 (11:09 +0200)]
s/PHP Version 5/PHP Version 7/g
Follow up for
d0cb7153
Dmitry Stogov [Fri, 13 Mar 2015 08:29:43 +0000 (11:29 +0300)]
Added API function to call VM opcode handler in a portable way
Vektah [Fri, 13 Mar 2015 04:54:30 +0000 (15:54 +1100)]
Fix a leak
Xinchen Hui [Fri, 13 Mar 2015 04:02:39 +0000 (12:02 +0800)]
Revert previously commit by accident
Vektah [Fri, 13 Mar 2015 02:15:57 +0000 (13:15 +1100)]
Fix bug #69227 and #65967
This patch fixes a use (in zend_gc.c) after free (in spl_observer.c).
See https://bugs.php.net/bug.php?id=69227
Dmitry Stogov [Fri, 13 Mar 2015 00:28:21 +0000 (03:28 +0300)]
Allow CALL executor to keep few very often used vaiables in CPU registers.
This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS.
Only tested on Linux x86 and x86_64 with GCC 4.9.2.
Dmitry Stogov [Thu, 12 Mar 2015 17:39:04 +0000 (20:39 +0300)]
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
Anatol Belski [Thu, 12 Mar 2015 16:31:28 +0000 (17:31 +0100)]
improve ssl operations with possible renegotiation
Anatol Belski [Thu, 12 Mar 2015 15:24:56 +0000 (16:24 +0100)]
use _set_errno where appropriate
Anatol Belski [Thu, 12 Mar 2015 14:26:12 +0000 (15:26 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
create the php prefix if doesn't exist
Anatol Belski [Thu, 12 Mar 2015 14:25:43 +0000 (15:25 +0100)]
create php prefix before copying dlls
Anatol Belski [Thu, 12 Mar 2015 14:21:33 +0000 (15:21 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
create the php prefix if doesn't exist
Anatol Belski [Thu, 12 Mar 2015 14:20:53 +0000 (15:20 +0100)]
create the php prefix if doesn't exist
Dmitry Stogov [Thu, 12 Mar 2015 13:58:50 +0000 (16:58 +0300)]
Fixed tests
Dmitry Stogov [Thu, 12 Mar 2015 13:53:51 +0000 (16:53 +0300)]
Use specialized macro for string zval creation
Anatol Belski [Thu, 12 Mar 2015 12:42:36 +0000 (13:42 +0100)]
upgrade to oniguruman 5.9.6
Anatol Belski [Thu, 12 Mar 2015 12:28:43 +0000 (13:28 +0100)]
expose oniguruma version
Anatol Belski [Thu, 12 Mar 2015 12:00:36 +0000 (13:00 +0100)]
fix possible unititialized pointer usage
Anatol Belski [Thu, 12 Mar 2015 09:21:43 +0000 (10:21 +0100)]
simplify condition
Anatol Belski [Wed, 11 Mar 2015 23:36:22 +0000 (00:36 +0100)]
force ext/ftp to be always shared on Windows
Anatol Belski [Wed, 11 Mar 2015 23:13:01 +0000 (00:13 +0100)]
remove ext/openssl dependency for ext/ftp from conf
Anatol Belski [Wed, 11 Mar 2015 22:58:59 +0000 (23:58 +0100)]
don't depend on ext/openssl for ftp ssl support
instead just link against the openssl and init manually, that's
more flexible
Anatol Belski [Wed, 11 Mar 2015 22:42:39 +0000 (23:42 +0100)]
init mbstring tsrm_ls_cache on MINIT
as some globals are accessed there already
Anatol Belski [Wed, 11 Mar 2015 19:41:27 +0000 (20:41 +0100)]
properly deinit mail socket
Anatol Belski [Wed, 11 Mar 2015 18:07:46 +0000 (19:07 +0100)]
use proper value to check the log_source handle
Anatol Belski [Wed, 11 Mar 2015 14:07:44 +0000 (15:07 +0100)]
fix ftp_login with ssl enabled
Anatol Belski [Wed, 11 Mar 2015 13:04:45 +0000 (14:04 +0100)]
added comment
Anatol Belski [Wed, 11 Mar 2015 12:30:26 +0000 (13:30 +0100)]
enable ftps for shared ext/ftp
Anatol Belski [Wed, 11 Mar 2015 07:55:16 +0000 (08:55 +0100)]
use portable fseek
Daniel Lowrey [Wed, 11 Mar 2015 15:45:28 +0000 (09:45 -0600)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Don't block on crypto data inside stream_select()
Daniel Lowrey [Wed, 11 Mar 2015 15:44:07 +0000 (09:44 -0600)]
Don't block on crypto data inside stream_select()
Nikita Popov [Wed, 11 Mar 2015 14:26:33 +0000 (15:26 +0100)]
Fix some memory leaks in WebPhar
Dmitry Stogov [Wed, 11 Mar 2015 12:03:07 +0000 (15:03 +0300)]
Improved php_json_escape_string()
Dmitry Stogov [Wed, 11 Mar 2015 12:02:47 +0000 (15:02 +0300)]
Improved table search
Xinchen Hui [Wed, 11 Mar 2015 08:54:51 +0000 (16:54 +0800)]
Comment out for now
Xinchen Hui [Wed, 11 Mar 2015 08:31:34 +0000 (16:31 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Nikita Popov [Wed, 11 Mar 2015 08:23:29 +0000 (09:23 +0100)]
Fix memory leak
Xinchen Hui [Wed, 11 Mar 2015 05:42:39 +0000 (13:42 +0800)]
Fixed memleak
Xinchen Hui [Wed, 11 Mar 2015 02:33:43 +0000 (10:33 +0800)]
Fixed memory leak
Xinchen Hui [Wed, 11 Mar 2015 00:20:19 +0000 (08:20 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Wed, 11 Mar 2015 00:20:03 +0000 (08:20 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 11 Mar 2015 00:19:34 +0000 (08:19 +0800)]
Improve test script for #69212
Daniel Lowrey [Wed, 11 Mar 2015 00:18:19 +0000 (18:18 -0600)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug# 69215 (Crypto servers should send client CA list)
Conflicts:
ext/openssl/xp_ssl.c
Daniel Lowrey [Wed, 11 Mar 2015 00:06:00 +0000 (18:06 -0600)]
Fix bug# 69215 (Crypto servers should send client CA list)
Dmitry Stogov [Tue, 10 Mar 2015 22:28:13 +0000 (01:28 +0300)]
Fixed memory leaks
Dmitry Stogov [Tue, 10 Mar 2015 21:57:28 +0000 (00:57 +0300)]
Free memory if destructor wasn't called
Dmitry Stogov [Tue, 10 Mar 2015 20:16:09 +0000 (23:16 +0300)]
Fixed memory leak
Dmitry Stogov [Tue, 10 Mar 2015 20:04:41 +0000 (23:04 +0300)]
More accurate reference counting on closures
Nikita Popov [Tue, 10 Mar 2015 17:26:09 +0000 (18:26 +0100)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Nikita Popov [Tue, 10 Mar 2015 17:18:43 +0000 (18:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Tue, 10 Mar 2015 17:17:56 +0000 (18:17 +0100)]
Fixed bug #69212
Dmitry Stogov [Tue, 10 Mar 2015 16:32:38 +0000 (19:32 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
We don't cache custom strems with callbacks anymore
Conflicts:
ext/opcache/ZendAccelerator.c
Dmitry Stogov [Tue, 10 Mar 2015 16:30:32 +0000 (19:30 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
We don't cache custom strems with callbacks anymore
Dmitry Stogov [Tue, 10 Mar 2015 16:25:30 +0000 (19:25 +0300)]
We don't cache custom strems with callbacks anymore
Dmitry Stogov [Tue, 10 Mar 2015 15:50:07 +0000 (18:50 +0300)]
Prevent possible double inheritance (ext/opcache/tests/bug67215.phpt)
Anatol Belski [Tue, 10 Mar 2015 11:11:52 +0000 (12:11 +0100)]
C89 compat
Dmitry Stogov [Tue, 10 Mar 2015 11:05:14 +0000 (14:05 +0300)]
Fixed access on uninitialized data in Zend/tests/closure_019.phpt
Xinchen Hui [Tue, 10 Mar 2015 09:26:15 +0000 (17:26 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 10 Mar 2015 09:18:54 +0000 (17:18 +0800)]
Merge branch 'PHP-5.6'
Anatol Belski [Tue, 10 Mar 2015 09:20:43 +0000 (10:20 +0100)]
correct tests as the issue is only reproduceable with cgi/fpm
Xinchen Hui [Tue, 10 Mar 2015 09:18:47 +0000 (17:18 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 09:18:39 +0000 (17:18 +0800)]
Typo
Xinchen Hui [Tue, 10 Mar 2015 09:09:41 +0000 (17:09 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 10 Mar 2015 09:09:28 +0000 (17:09 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Tue, 10 Mar 2015 09:06:05 +0000 (17:06 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 09:05:47 +0000 (17:05 +0800)]
Fixed test
Anatol Belski [Tue, 10 Mar 2015 08:09:16 +0000 (09:09 +0100)]
added more exception tests
Anatol Belski [Mon, 9 Mar 2015 19:38:34 +0000 (20:38 +0100)]
fix leaking registry key handle
Anatol Belski [Mon, 9 Mar 2015 18:34:09 +0000 (19:34 +0100)]
don't pass zero to malloc()
Xinchen Hui [Tue, 10 Mar 2015 07:49:02 +0000 (15:49 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Xinchen Hui [Tue, 10 Mar 2015 07:38:34 +0000 (15:38 +0800)]
Update NEWS
Xinchen Hui [Tue, 10 Mar 2015 07:37:14 +0000 (15:37 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 07:36:42 +0000 (15:36 +0800)]
Fixed bug #66609 (php crashes with __get() and ++ operator in some cases)
Dmitry Stogov [Tue, 10 Mar 2015 07:31:55 +0000 (10:31 +0300)]
Errors converted to exceptions are not "recoverable" anymore.
Xinchen Hui [Tue, 10 Mar 2015 07:04:01 +0000 (15:04 +0800)]
Fixed phar test segfault after merged engine exception
Xinchen Hui [Tue, 10 Mar 2015 07:03:15 +0000 (15:03 +0800)]
Revert "Fixed phar file action failure after engine exception rfc been merged"
This reverts commit
f174859acdb9d99176440a30b6608388a383de3f .
Daniel Lowrey [Tue, 10 Mar 2015 05:15:04 +0000 (23:15 -0600)]
Update NEWS/UPGRADING
Daniel Lowrey [Tue, 10 Mar 2015 04:55:17 +0000 (22:55 -0600)]
Deprecate "session_meta_capture" SSL context option
Meta data about encrypted streams is now available as part of the
"crypto" key in the array returned by stream_get_meta_data(). This
update deprecates the use of the "session_meta_capture" ssl
context option in encrypted streams.
Daniel Lowrey [Tue, 10 Mar 2015 04:41:36 +0000 (22:41 -0600)]
Revert "Add stream_socket_crypto_info() function"
This reverts commit
13acb7ec653c543c56437ed417c3889fbf54f608 .
With the added capability to negotiate application layer protocols
via the TLS ALPN extension userland needs a method to access the
negotiated protocol on a given stream. The reverted commit added
a new stream_socket_crypto_info() function for this purpose.
This original approach was discarded in favor of using the
already-existing stream_get_meta_data() API which specifically
exists for just such purposes and requires the addition of no new
functions.
Daniel Lowrey [Tue, 10 Mar 2015 04:30:38 +0000 (22:30 -0600)]
Add crypto info to stream_get_meta_data() result on encrypted streams
A "crypto" key is added to the output of stream_get_meta_data() calls
when invoked using a stream on which crypto is currently active. The
new key's associated array contains the following keys:
- protocol (string e.g. TLSv1.2, TLSv1.1, etc)
- cipher_name (string)
- cipher_bits (int)
- cipher_version (string)
If the TLS ALPN extension was used to successfully negotiate an
application protocol that protocol's identifier is stored in the
following key:
- alpn_protocol
If no ALPN protocol was negotiated the "alpn_protocol" key is not
present in the crypto meta data array. More meta information
concerning the stream's active encryption state may be added in the
future.
Xinchen Hui [Tue, 10 Mar 2015 02:44:07 +0000 (10:44 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 10 Mar 2015 02:43:05 +0000 (10:43 +0800)]
Fix is reverted (test fails in all branches)