]>
granicus.if.org Git - php/log
Anatol Belski [Mon, 16 Mar 2015 20:55:40 +0000 (13:55 -0700)]
test fixes + added skipif for slow tests
Anatol Belski [Mon, 16 Mar 2015 20:21:33 +0000 (13:21 -0700)]
use busy sleep instead of sleep() for timeout tests
Anatol Belski [Mon, 16 Mar 2015 19:05:40 +0000 (20:05 +0100)]
remove ext/mysql enablement from travis build
Anatol Belski [Mon, 16 Mar 2015 18:37:07 +0000 (19:37 +0100)]
test timeout with shutdown function, variation
Anatol Belski [Mon, 16 Mar 2015 18:35:36 +0000 (19:35 +0100)]
test timeout with shutdown function
Anatol Belski [Mon, 16 Mar 2015 18:30:04 +0000 (19:30 +0100)]
test timeout with foreach loop
Anatol Belski [Mon, 16 Mar 2015 18:28:01 +0000 (19:28 +0100)]
test timeout with for loop
Anatol Belski [Mon, 16 Mar 2015 18:26:17 +0000 (19:26 +0100)]
test timeout with exception variation
Anatol Belski [Mon, 16 Mar 2015 18:21:58 +0000 (19:21 +0100)]
test timeout with exception
Anatol Belski [Mon, 16 Mar 2015 18:16:09 +0000 (19:16 +0100)]
fix timeout with cal_user_func
Anatol Belski [Mon, 16 Mar 2015 18:12:55 +0000 (19:12 +0100)]
test timeout within eval()
Anatol Belski [Mon, 16 Mar 2015 18:05:21 +0000 (19:05 +0100)]
test timeout with array_walk
Anatol Belski [Mon, 16 Mar 2015 18:01:23 +0000 (19:01 +0100)]
test timeout within function
Anatol Belski [Mon, 16 Mar 2015 17:58:32 +0000 (18:58 +0100)]
test timeout within while loop
Dmitry Stogov [Mon, 16 Mar 2015 16:48:29 +0000 (17:48 +0100)]
improved timeout handling on windows
Julien Pauli [Mon, 16 Mar 2015 15:11:02 +0000 (16:11 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix flaws in session module
Conflicts:
ext/session/session.c
Julien Pauli [Mon, 16 Mar 2015 15:01:12 +0000 (16:01 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix flaws in session module
Julien Pauli [Mon, 16 Mar 2015 15:00:46 +0000 (16:00 +0100)]
Fix flaws in session module
Dmitry Stogov [Mon, 16 Mar 2015 12:53:54 +0000 (15:53 +0300)]
Use memcmp() instead of strncmp()
Xinchen Hui [Mon, 16 Mar 2015 10:43:21 +0000 (18:43 +0800)]
Improved parser (make use_type reuseable)
Xinchen Hui [Mon, 16 Mar 2015 09:10:26 +0000 (17:10 +0800)]
Let phpdbg refused to be compiled with no CALL zend vm kind
Xinchen Hui [Mon, 16 Mar 2015 09:00:04 +0000 (17:00 +0800)]
Exposed ZEND_VM_KIND etc
Xinchen Hui [Mon, 16 Mar 2015 08:59:31 +0000 (16:59 +0800)]
Remove --with-zend-vm (it doesn't work anyway)
Anatol Belski [Mon, 16 Mar 2015 07:35:10 +0000 (08:35 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backport
af2b0669 into 5.5
Anatol Belski [Mon, 16 Mar 2015 07:34:14 +0000 (08:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport
af2b0669 into 5.5
Anatol Belski [Mon, 16 Mar 2015 07:32:39 +0000 (08:32 +0100)]
backport
af2b0669 into 5.5
Anatol Belski [Sun, 15 Mar 2015 17:39:38 +0000 (18:39 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
libxml-2.9.2 compatibility
Anatol Belski [Sun, 15 Mar 2015 17:38:50 +0000 (18:38 +0100)]
libxml-2.9.2 compatibility
Anatol Belski [Sat, 14 Mar 2015 17:31:02 +0000 (18:31 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test
Anatol Belski [Sat, 14 Mar 2015 17:30:32 +0000 (18:30 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Anatol Belski [Sat, 14 Mar 2015 17:29:59 +0000 (18:29 +0100)]
fix test
Dmitry Stogov [Sat, 14 Mar 2015 12:11:55 +0000 (15:11 +0300)]
Fixed inconsistency
Nikita Popov [Sat, 14 Mar 2015 08:18:50 +0000 (09:18 +0100)]
Merge branch 'PHP-5.6'
Nikita Popov [Sat, 14 Mar 2015 08:18:03 +0000 (09:18 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Jeff Welch [Mon, 9 Mar 2015 11:14:22 +0000 (07:14 -0400)]
Fix #69203: FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127
Reeze Xia [Sat, 14 Mar 2015 06:06:57 +0000 (14:06 +0800)]
Fix folder mark
Xinchen Hui [Sat, 14 Mar 2015 03:32:09 +0000 (11:32 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Sat, 14 Mar 2015 03:31:53 +0000 (11:31 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Sat, 14 Mar 2015 03:31:12 +0000 (11:31 +0800)]
Fixed typo
Anatol Belski [Fri, 13 Mar 2015 19:25:10 +0000 (20:25 +0100)]
fix syntax for the Visual studio compat
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