]>
granicus.if.org Git - php/log
Bob Weinand [Mon, 25 May 2015 16:38:40 +0000 (18:38 +0200)]
Merge context sensitive lexer RFC
Dmitry Stogov [Mon, 25 May 2015 16:20:52 +0000 (19:20 +0300)]
Fixed typo
Anatol Belski [Mon, 25 May 2015 16:07:47 +0000 (18:07 +0200)]
move S_IFLNK define into header
Anatol Belski [Mon, 25 May 2015 11:47:31 +0000 (13:47 +0200)]
further cleanups with S_IF* macros generalized declarations
Anatol Belski [Mon, 25 May 2015 11:28:18 +0000 (13:28 +0200)]
cleanup more redundant S_IS* declarations
Anatol Belski [Mon, 25 May 2015 11:22:54 +0000 (13:22 +0200)]
cleanup redundant S_IFDIR declaration
Anatol Belski [Mon, 25 May 2015 11:21:01 +0000 (13:21 +0200)]
cleanup duplicated stat declarations in ext/phar
Anatol Belski [Mon, 25 May 2015 11:17:35 +0000 (13:17 +0200)]
move some stat declarations into zend_virtual_cwd.h
more cleanup to go
Dmitry Stogov [Mon, 25 May 2015 15:29:31 +0000 (18:29 +0300)]
Fixed bug #69700 (tests/lang/this_assignment.phpt memory errors)
Anatol Belski [Sun, 24 May 2015 13:38:39 +0000 (15:38 +0200)]
pick up sasl auth plugins if there was any in the deps
Anatol Belski [Fri, 22 May 2015 11:39:25 +0000 (13:39 +0200)]
remove non-applicable comment
Anatol Belski [Fri, 22 May 2015 07:51:54 +0000 (09:51 +0200)]
fix datetime tests with vc14
VC14 RC seems to support more format extensions, however some
difrerences do still persist.
Anatol Belski [Fri, 22 May 2015 06:01:48 +0000 (08:01 +0200)]
make the test more reliable
Nikita Popov [Sun, 24 May 2015 18:27:30 +0000 (20:27 +0200)]
Improve phpdbg opcode dump
Don't show <unused>, just don't display anything instead.
Dump nums used in op1/op2/result, e.g. for SEND, RECV etc.
Split the switch into three parts, one for each operand.
Remi Collet [Sun, 24 May 2015 07:40:08 +0000 (09:40 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
Fixed Bug #69479 GD fails to build with newer libvpx
Remi Collet [Sun, 24 May 2015 07:39:44 +0000 (09:39 +0200)]
NEWS
Remi Collet [Sun, 24 May 2015 07:39:20 +0000 (09:39 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
Fixed Bug #69479 GD fails to build with newer libvpx
Remi Collet [Sun, 24 May 2015 07:39:03 +0000 (09:39 +0200)]
NEWS
Remi Collet [Sun, 24 May 2015 07:37:12 +0000 (09:37 +0200)]
Fixed Bug #69479 GD fails to build with newer libvpx
From upstream https://github.com/libgd/libgd/commit/
d41eb72cd4545c394578332e5c102dee69e02ee8
Fix build with latest libvpx 1.4.0
These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
Anatol Belski [Sat, 23 May 2015 21:02:47 +0000 (23:02 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Anatol Belski [Sat, 23 May 2015 21:02:09 +0000 (23:02 +0200)]
updated NEWS
Nikita Popov [Sat, 23 May 2015 19:15:11 +0000 (21:15 +0200)]
Fixes for x32 ABI
I'm assuming that we want to have 64bit zend_longs on x32 here.
This fixes two typos in __x86_64__ macros and adds sign-extension
when assigning STREAM_COPY_ALL to zend_long.
Anatol Belski [Sat, 23 May 2015 16:47:26 +0000 (18:47 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
increase the internal post data buffer
Anatol Belski [Sat, 23 May 2015 16:44:39 +0000 (18:44 +0200)]
increase the internal post data buffer
This brings speedup and fixes issues with var parsing. Default BUFSIZ
on Windows is 512 bytes which causes too much reallocation work.
Levi Morrison [Thu, 21 May 2015 01:54:11 +0000 (19:54 -0600)]
Inline zend_find_builtin_type
This function was used only inside of zend_find_builtin_type_by_name,
which is also used only one time.
Levi Morrison [Thu, 21 May 2015 01:50:20 +0000 (19:50 -0600)]
Remove duplication
Levi Morrison [Thu, 21 May 2015 01:39:31 +0000 (19:39 -0600)]
Rename some variables and functions
The way these are used have little to do with them being scalars;
they are just tuples with names, lengths and IS_* constants. We
will probably reuse these in the future with other types.
Radu Brănișcan [Wed, 20 May 2015 00:08:50 +0000 (03:08 +0300)]
Corrected line comment 5256
From the text "dectupt" to "decrypt"
Nikita Popov [Fri, 22 May 2015 20:31:02 +0000 (22:31 +0200)]
Remove ZEND_BRK/ZEND_CONT from VM
These are no longer used at run-time now, only temporarily during
compilation.
Nikita Popov [Fri, 22 May 2015 20:17:40 +0000 (22:17 +0200)]
Use ZEND_JMP instead of ZEND_BRK/ZEND_CONT
Emit necessary FREEs during compilation, convert to JMP during
pass_two (we may not know target opline beforehand).
Nikita Popov [Fri, 22 May 2015 20:08:44 +0000 (22:08 +0200)]
Embed break/continue depth into opline
Previously a separate lval literal was used - this is probably a
leftover from the time where the break level could still be
specified dynamically.
Nikita Popov [Fri, 22 May 2015 19:35:33 +0000 (21:35 +0200)]
Move loop var stack management into begin/end loop
Also set start to -1 in begin_loop already, so the info that a
loop variable is not used is already available at compile-time.
Nikita Popov [Fri, 22 May 2015 19:05:47 +0000 (21:05 +0200)]
Drop FREE_ON_RETURN flag, check brk_cont->start instead
Start >= 0 already tells us whether or not the loop has a loop
variable, no need to add extra flags to opcodes.
Also added a test for a case where FREE_ON_RETURN is relevant,
we didn't seem to have any coverage for this.
Nikita Popov [Fri, 22 May 2015 18:44:16 +0000 (20:44 +0200)]
Drop THIS_HASHVAL define
No longer used
Anatol Belski [Fri, 22 May 2015 19:32:40 +0000 (21:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix test
Add entry for bug #69354, fixed in 5.5.25
Add CVE for bugs in 5.6.9
Add entry about PCRE upgrade (rev
95fa7279 )
Add CVE for bugs in 5.5.25
Conflicts:
ext/phar/tests/bug69441.phpt
Anatol Belski [Fri, 22 May 2015 19:27:19 +0000 (21:27 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Anatol Belski [Fri, 22 May 2015 19:25:52 +0000 (21:25 +0200)]
fix test
Sometimes the path is unixified, sometimes not, so better don't
care about the slash in this case.
Lior Kaplan [Fri, 22 May 2015 08:18:32 +0000 (11:18 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Add entry for bug #69354, fixed in 5.5.25
Add entry about PCRE upgrade (rev
95fa7279 )
Add CVE for bugs in 5.5.25
Lior Kaplan [Fri, 22 May 2015 08:17:01 +0000 (11:17 +0300)]
Add entry for bug #69354, fixed in 5.5.25
Lior Kaplan [Fri, 22 May 2015 08:15:36 +0000 (11:15 +0300)]
Add CVE for bugs in 5.6.9
Lior Kaplan [Fri, 22 May 2015 08:02:01 +0000 (11:02 +0300)]
Add entry about PCRE upgrade (rev
95fa7279 )
Lior Kaplan [Fri, 22 May 2015 07:58:28 +0000 (10:58 +0300)]
Add CVE for bugs in 5.5.25
Xinchen Hui [Fri, 22 May 2015 03:50:55 +0000 (11:50 +0800)]
Forgot the test for bug #69688
Xinchen Hui [Fri, 22 May 2015 03:49:15 +0000 (11:49 +0800)]
Fixed test
Xinchen Hui [Fri, 22 May 2015 03:48:13 +0000 (11:48 +0800)]
Fixed bug #69688 (segfault with eval and opcache fast shutdown)
Anthony Ferrara [Thu, 21 May 2015 21:12:51 +0000 (17:12 -0400)]
Fixed bug #69686 password_verify reports back error on PHP7 will null string.
The deprecation of DES salts created a warning when trying to verify them with password_hash. This bug fix adds a quiet mode to php_crypt() which is used by password_verify.
Nikita Popov [Thu, 21 May 2015 19:07:05 +0000 (21:07 +0200)]
Fix scope_is_known() for class constants
Here the active_op_array is still the surrounding file, but we
do know the scope.
Dmitry Stogov [Thu, 21 May 2015 14:57:06 +0000 (17:57 +0300)]
Fixed build with DEBUG_COMPACT_LITERALS=1
Dmitry Stogov [Thu, 21 May 2015 13:34:59 +0000 (16:34 +0300)]
Fixed typo in ZEND_GCC_GLOBAL_REGS configure test (Albert)
Peter Cowburn [Thu, 21 May 2015 12:17:27 +0000 (13:17 +0100)]
removed old news item
This change was introduced in PHP 5.5.21 and 5.6.5
Remi Collet [Thu, 21 May 2015 12:07:14 +0000 (14:07 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Fixed bug #69680 (phar symlink in binary directory broken).
Make the phar symlink relative
Remi Collet [Thu, 21 May 2015 12:07:02 +0000 (14:07 +0200)]
NEWS
Remi Collet [Thu, 21 May 2015 12:06:26 +0000 (14:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69680 (phar symlink in binary directory broken).
Make the phar symlink relative
Remi Collet [Thu, 21 May 2015 12:05:15 +0000 (14:05 +0200)]
Fixed bug #69680 (phar symlink in binary directory broken).
Relative symlink are better, as relative to link directory.
ponce [Thu, 21 May 2015 11:30:58 +0000 (13:30 +0200)]
Make the phar symlink relative
or we got a symlink pointing to the build files
thanks also to remicollet
Anatol Belski [Thu, 21 May 2015 08:57:30 +0000 (10:57 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
remove duplicated declaration, fix build
Anatol Belski [Thu, 21 May 2015 08:56:14 +0000 (10:56 +0200)]
remove duplicated declaration, fix build
Anatol Belski [Thu, 21 May 2015 07:49:18 +0000 (09:49 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
added missing GLOB_BRACE support check
added SKIPIF section to test to make sure that GLOB_BRACE is supported
fix #69628: complex GLOB_BRACE fails on Windows
added PHPT to check for bug #69628
Anatol Belski [Thu, 21 May 2015 07:47:59 +0000 (09:47 +0200)]
updated NEWS
Anatol Belski [Thu, 21 May 2015 07:47:30 +0000 (09:47 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
added missing GLOB_BRACE support check
added SKIPIF section to test to make sure that GLOB_BRACE is supported
fix #69628: complex GLOB_BRACE fails on Windows
added PHPT to check for bug #69628
Anatol Belski [Thu, 21 May 2015 07:47:02 +0000 (09:47 +0200)]
updated NEWS
Christoph M. Becker [Wed, 20 May 2015 18:23:21 +0000 (20:23 +0200)]
added missing GLOB_BRACE support check
Christoph M. Becker [Wed, 20 May 2015 16:39:07 +0000 (18:39 +0200)]
added SKIPIF section to test to make sure that GLOB_BRACE is supported
Christoph M. Becker [Wed, 13 May 2015 21:47:54 +0000 (23:47 +0200)]
fix #69628: complex GLOB_BRACE fails on Windows
Christoph M. Becker [Wed, 13 May 2015 20:37:33 +0000 (22:37 +0200)]
added PHPT to check for bug #69628
Anatol Belski [Thu, 21 May 2015 06:52:41 +0000 (08:52 +0200)]
Merge branch 'pull-request/1278'
Anatol Belski [Thu, 21 May 2015 06:22:30 +0000 (08:22 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix handling VAR vs VAR= in putenv
Anatol Belski [Thu, 21 May 2015 06:21:53 +0000 (08:21 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix handling VAR vs VAR= in putenv
Anatol Belski [Thu, 21 May 2015 06:19:54 +0000 (08:19 +0200)]
fix handling VAR vs VAR= in putenv
using _putenv_s eliminates behavior diff in TS/NTS
Bob Weinand [Thu, 21 May 2015 02:17:17 +0000 (04:17 +0200)]
Add support for string dictionaries, fix array dictionaries ({de,in}flate)
Dmitry Stogov [Thu, 21 May 2015 01:13:10 +0000 (04:13 +0300)]
Fixed zend_update_class_constants() to always resolve all constants.
Call zend_update_class_constants() only when necessary.
Adam Harvey [Thu, 21 May 2015 00:26:20 +0000 (19:26 -0500)]
Add documentation contribution information.
Adam Harvey [Thu, 21 May 2015 00:12:48 +0000 (19:12 -0500)]
Add a bare bones CONTRIBUTING.md.
I was not at all guilted into this by the open source summit at php[tek]. Not
at all.
(such guilt)
This is based mostly on information already on our Web site, and is primarily a
set of links to other pages. Still, if we can encourage more contributors,
let's do it!
Dmitry Stogov [Wed, 20 May 2015 21:51:34 +0000 (00:51 +0300)]
Set proper type_info flags.
Dmitry Stogov [Wed, 20 May 2015 20:33:55 +0000 (23:33 +0300)]
Fixed SHM+FILE cache with opcache.protect_memory=1
Dmitry Stogov [Wed, 20 May 2015 20:12:04 +0000 (23:12 +0300)]
Improved script copyining from SHM to process memory
Dmitry Stogov [Wed, 20 May 2015 19:51:45 +0000 (22:51 +0300)]
Micro optimization
Dmitry Stogov [Wed, 20 May 2015 19:49:37 +0000 (22:49 +0300)]
Fixed access to wrong opline (it may be the last ZEND_THROW in op_array->opcodes)
Christoph M. Becker [Wed, 20 May 2015 18:23:21 +0000 (20:23 +0200)]
added missing GLOB_BRACE support check
Anatol Belski [Wed, 20 May 2015 17:08:59 +0000 (19:08 +0200)]
add license header
Anatol Belski [Wed, 20 May 2015 17:05:57 +0000 (19:05 +0200)]
add license header
Anatol Belski [Wed, 20 May 2015 17:02:43 +0000 (19:02 +0200)]
remove dead code
Anatol Belski [Wed, 20 May 2015 16:51:19 +0000 (18:51 +0200)]
add vim modelines
Anatol Belski [Wed, 20 May 2015 16:46:30 +0000 (18:46 +0200)]
add vim modeline
Anatol Belski [Wed, 20 May 2015 16:44:58 +0000 (18:44 +0200)]
disable unused members in struct rusage
Christoph M. Becker [Wed, 20 May 2015 16:39:07 +0000 (18:39 +0200)]
added SKIPIF section to test to make sure that GLOB_BRACE is supported
Nikita Popov [Wed, 20 May 2015 16:00:37 +0000 (18:00 +0200)]
Expose pdo stmt ctor args to gc
These very commonly contain a reference to the PDO object itself.
Nikita Popov [Thu, 16 Apr 2015 08:07:41 +0000 (10:07 +0200)]
Add GC support for ArrayObject
gc_024 test changes because the array that ArrayObject holds is
now counted separately from the ArrayObject.
Nikita Popov [Sun, 17 May 2015 19:49:53 +0000 (21:49 +0200)]
Show argument causing TypeException in trace
Not sure why that check was there, did I miss something?
Kalle Sommer Nielsen [Wed, 20 May 2015 14:15:40 +0000 (16:15 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Wed, 20 May 2015 14:15:11 +0000 (16:15 +0200)]
long > zend_long (Thanks Anatol)
Anatol Belski [Wed, 20 May 2015 13:55:32 +0000 (15:55 +0200)]
fixed test
Kalle Sommer Nielsen [Wed, 20 May 2015 13:50:00 +0000 (15:50 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Wed, 20 May 2015 13:45:37 +0000 (15:45 +0200)]
Windows support for getrusage()
* See getrusage.c/h for implementation details and limitations
* Tests passes and have had their SKIPIF updated
* psapi.lib is now linked to by default
Remi Collet [Wed, 20 May 2015 12:03:01 +0000 (14:03 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
move test
Remi Collet [Wed, 20 May 2015 12:02:25 +0000 (14:02 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
move test
Remi Collet [Wed, 20 May 2015 12:02:13 +0000 (14:02 +0200)]
move test
Xinchen Hui [Wed, 20 May 2015 08:56:28 +0000 (16:56 +0800)]
Merge branch 'patch-5' of https://github.com/ovr/php-src
Remi Collet [Wed, 20 May 2015 06:31:46 +0000 (08:31 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix new test
Remi Collet [Wed, 20 May 2015 06:30:44 +0000 (08:30 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix new test