]>
granicus.if.org Git - php/log
Florian MARGAINE [Sat, 20 Sep 2014 08:03:54 +0000 (10:03 +0200)]
Deletes patch leftovers
Florian MARGAINE [Sat, 20 Sep 2014 08:01:44 +0000 (10:01 +0200)]
Replaces php5 with php7, without whitespace changes.
Nuno Lopes [Sun, 31 Aug 2014 15:45:11 +0000 (11:45 -0400)]
remove a few gcc format attributes from some printf-like functions
Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it
Nuno Lopes [Sun, 31 Aug 2014 14:19:14 +0000 (15:19 +0100)]
add a few more patterns to .gitignore
Anatol Belski [Fri, 29 Aug 2014 22:33:33 +0000 (00:33 +0200)]
fix expected warning in test
Anatol Belski [Fri, 29 Aug 2014 22:28:10 +0000 (00:28 +0200)]
fix dir separators in test
Anatol Belski [Fri, 29 Aug 2014 22:24:41 +0000 (00:24 +0200)]
fix iptcembed()
Nikita Popov [Sat, 30 Aug 2014 18:45:10 +0000 (20:45 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_compile.c
Nikita Popov [Sat, 30 Aug 2014 18:41:36 +0000 (20:41 +0200)]
Fix bug #67938: Segfault when extending interface method with variadic
We only want to check extra optional args if the proto function is
variadic, not when we're adding extra variadic args.
Anatol Belski [Sat, 30 Aug 2014 02:06:25 +0000 (04:06 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Anatol Belski [Sat, 30 Aug 2014 02:06:00 +0000 (04:06 +0200)]
updated NEWS
Anatol Belski [Sat, 30 Aug 2014 02:05:42 +0000 (04:05 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
Anatol Belski [Sat, 30 Aug 2014 02:04:42 +0000 (04:04 +0200)]
Fixed bug #67731 finfo::file() returns invalid mime type for binary files
Johannes Schlüter [Fri, 29 Aug 2014 22:02:31 +0000 (00:02 +0200)]
Use global symbol table for completion after $ in readline.
Nikita Popov [Fri, 29 Aug 2014 20:06:48 +0000 (22:06 +0200)]
Don't depend on exact parse error messages in assert tests
Nikita Popov [Fri, 29 Aug 2014 19:47:10 +0000 (21:47 +0200)]
Combine foreach copy / switch cond stacks
Now one common stack to handle both, which stores znodes instead of
full oplines (foreach copy stack) or switch entries (switch cond
stack).
Also removed EG(start_op) while at it.
Nikita Popov [Fri, 29 Aug 2014 18:52:26 +0000 (20:52 +0200)]
Don't distinguish between ast/list in parser
This removes the need to use $<ast>{n} or $<list>$ casts in the
reduction actions.
Keeping the distinction in the parser doesn't really give us any
benefit and only makes changing the grammar harder.
Nikita Popov [Fri, 29 Aug 2014 16:51:58 +0000 (18:51 +0200)]
Introduce optional_expr
Nikita Popov [Fri, 29 Aug 2014 16:46:46 +0000 (18:46 +0200)]
Remove parenthesis_expr
This was necessary previously to handle yields, now it only clutters
up the grammar.
Nikita Popov [Fri, 29 Aug 2014 16:42:05 +0000 (18:42 +0200)]
Simplify `argument` production
Christopher Jones [Fri, 29 Aug 2014 15:48:56 +0000 (08:48 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Remove 550+ compile warnings on OS X
Christopher Jones [Fri, 29 Aug 2014 15:48:43 +0000 (08:48 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Remove 550+ compile warnings on OS X
Christopher Jones [Fri, 29 Aug 2014 15:48:10 +0000 (08:48 -0700)]
Remove 550+ compile warnings on OS X
The warnings had the signature:
php-src/ext/mysqlnd/mysqlnd_debug.h:127:25: note: expanded from macro 'DBG_ENTER_EX2'
if (dbg_skip_trace); /* shut compiler's mouth */\
^
php-src/ext/mysqlnd/mysqlnd.c:114:2: note: put the semicolon on a separate line to silence this warning
Christopher Jones [Fri, 29 Aug 2014 15:47:10 +0000 (08:47 -0700)]
Allow PHP 7 to install in Apache 2 on OS X
This fixes the fundamental part of #67910. The complete change from
php5 -> php7 in sapi/* still needs to be done.
Anatol Belski [Fri, 29 Aug 2014 15:28:53 +0000 (17:28 +0200)]
restore the old behavior for the assignment to string offset
Anatol Belski [Fri, 29 Aug 2014 15:21:02 +0000 (17:21 +0200)]
revert the lstat part
Anatol Belski [Fri, 29 Aug 2014 11:43:40 +0000 (13:43 +0200)]
fix stat vs zend_stat
Anatol Belski [Fri, 29 Aug 2014 11:30:53 +0000 (13:30 +0200)]
fix implicit st_rdev element handling when negative value was passed
Anatol Belski [Fri, 29 Aug 2014 10:53:37 +0000 (12:53 +0200)]
data type fixes
Anatol Belski [Fri, 29 Aug 2014 09:21:07 +0000 (11:21 +0200)]
avoid usage of 'type' before the null pointer check
Anatol Belski [Fri, 29 Aug 2014 08:54:28 +0000 (10:54 +0200)]
exclude log2 usage which requires C99 support
Lior Kaplan [Fri, 29 Aug 2014 08:44:45 +0000 (11:44 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add missing CVE IDs for 5.6.0
Align entiries format to "Fixed bug #..."
Use #66356 instead of #66714, as the latter is only a regression fix from the former.
Add an entry for bug#66060 (fixed in 5.5.8)
Lior Kaplan [Fri, 29 Aug 2014 08:31:07 +0000 (11:31 +0300)]
Add missing CVE IDs for 5.6.0
Lior Kaplan [Fri, 29 Aug 2014 08:28:22 +0000 (11:28 +0300)]
Align entiries format to "Fixed bug #..."
Lior Kaplan [Fri, 29 Aug 2014 08:26:27 +0000 (11:26 +0300)]
Use #66356 instead of #66714, as the latter is only a regression fix from the former.
Lior Kaplan [Fri, 29 Aug 2014 06:55:07 +0000 (09:55 +0300)]
Add an entry for bug#66060 (fixed in 5.5.8)
Anatol Belski [Fri, 29 Aug 2014 06:40:47 +0000 (08:40 +0200)]
fixed path in test
Stanislav Malyshev [Fri, 29 Aug 2014 06:13:24 +0000 (23:13 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Stanislav Malyshev [Fri, 29 Aug 2014 06:12:41 +0000 (23:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Stanislav Malyshev [Fri, 29 Aug 2014 06:11:08 +0000 (23:11 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Stanislav Malyshev [Fri, 29 Aug 2014 06:10:32 +0000 (23:10 -0700)]
fix NEWS for fcgi fix merge
David Zuelke [Sat, 9 Aug 2014 06:26:33 +0000 (08:26 +0200)]
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Xinchen Hui [Fri, 29 Aug 2014 05:19:14 +0000 (13:19 +0800)]
use zend_string_equals_ci
Xinchen Hui [Fri, 29 Aug 2014 05:05:58 +0000 (13:05 +0800)]
Keep folder mark style in this file
Xinchen Hui [Fri, 29 Aug 2014 03:28:21 +0000 (11:28 +0800)]
resource type is int
Johannes Schlüter [Thu, 28 Aug 2014 23:34:46 +0000 (01:34 +0200)]
Fix comparison in case of constant NULL as default value
Fixes "Fatal error: Default value for parameters with a class type hint
can only be NULL in ext/phar/phar.php on line 1120" whie creating phar.phar
Nikita Popov [Thu, 28 Aug 2014 22:18:38 +0000 (00:18 +0200)]
Fix bug #67922
Andrea Faulds [Thu, 28 Aug 2014 19:53:32 +0000 (20:53 +0100)]
Special-case aliases, add warning comments to implementations
Anatol Belski [Thu, 28 Aug 2014 20:22:38 +0000 (22:22 +0200)]
skip this if we can't check the uid
Anatol Belski [Thu, 28 Aug 2014 19:59:00 +0000 (21:59 +0200)]
fixed trim() and strtok() to work with big strings
Anatol Belski [Thu, 28 Aug 2014 17:35:37 +0000 (19:35 +0200)]
fixed strip_tags() and hebrev() to work with big strings
Anatol Belski [Thu, 28 Aug 2014 17:17:47 +0000 (19:17 +0200)]
make array/object APIs accept large strings as values of elements/props
Anatol Belski [Thu, 28 Aug 2014 16:54:54 +0000 (18:54 +0200)]
replace llabs with imaxabs
both are gcc built-in but imaxabs doesn't require C99 compat (see man)
Dmitry Stogov [Thu, 28 Aug 2014 16:51:22 +0000 (20:51 +0400)]
Duplicate array only if neccessary
Anatol Belski [Thu, 28 Aug 2014 15:39:03 +0000 (17:39 +0200)]
Merge branch 'master' of git.php.net:php-src
# By Popa Adrian Marius
# Via Popa Adrian Marius
* 'master' of git.php.net:php-src:
rename misleading define
Anatol Belski [Thu, 28 Aug 2014 15:35:54 +0000 (17:35 +0200)]
fix phar copy-on-write
Popa Adrian Marius [Thu, 28 Aug 2014 15:20:28 +0000 (18:20 +0300)]
rename misleading define
Anatol Belski [Thu, 28 Aug 2014 15:02:53 +0000 (17:02 +0200)]
fix incompatible pointer
Anatol Belski [Thu, 28 Aug 2014 13:41:03 +0000 (15:41 +0200)]
fix format
Anatol Belski [Thu, 28 Aug 2014 13:37:30 +0000 (15:37 +0200)]
remove duplicate condition already present a line upper
Popa Adrian Marius [Thu, 28 Aug 2014 14:10:42 +0000 (17:10 +0300)]
solve conflicting type size_t vs int
Dmitry Stogov [Thu, 28 Aug 2014 13:47:40 +0000 (17:47 +0400)]
Use better hash functions
Dmitry Stogov [Thu, 28 Aug 2014 13:23:12 +0000 (17:23 +0400)]
Refactored optimizer (compile different opimizer passes separately, instead of including *.c file)
Anatol Belski [Thu, 28 Aug 2014 11:07:47 +0000 (13:07 +0200)]
use stddef.h definitions for uintptr_t and intptr_t
Anatol Belski [Thu, 28 Aug 2014 10:12:24 +0000 (12:12 +0200)]
better alignment, won 8 byte on 64 bit with default alignment
Anatol Belski [Thu, 28 Aug 2014 10:07:39 +0000 (12:07 +0200)]
fix number format
Anatol Belski [Thu, 28 Aug 2014 09:56:27 +0000 (11:56 +0200)]
fix dir separator
Anatol Belski [Thu, 28 Aug 2014 09:37:34 +0000 (11:37 +0200)]
remove the expression parts, which are always true
Anatol Belski [Thu, 28 Aug 2014 09:32:24 +0000 (11:32 +0200)]
fix some types and unnecessary casts
Anatol Belski [Thu, 28 Aug 2014 08:54:27 +0000 (10:54 +0200)]
fix type
Xinchen Hui [Thu, 28 Aug 2014 09:37:00 +0000 (17:37 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Dmitry Stogov [Thu, 28 Aug 2014 09:13:52 +0000 (13:13 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix pg_last_notice()
Changed 'unsigned size_t' to 'size_t'
Fixed segfaults after change size_t of "s"
Fixed zend extensions multipy-times loadable
Revert "Fixed incompatible pointer type"
fix hash_pbkdf2()
Xinchen Hui [Thu, 28 Aug 2014 09:05:21 +0000 (17:05 +0800)]
Fixed typo
Xinchen Hui [Thu, 28 Aug 2014 09:04:04 +0000 (17:04 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 28 Aug 2014 09:03:27 +0000 (17:03 +0800)]
Fixed zbacktrace
Anatol Belski [Thu, 28 Aug 2014 08:28:13 +0000 (10:28 +0200)]
fix pg_last_notice()
Tjerk Meesters [Thu, 28 Aug 2014 08:39:35 +0000 (16:39 +0800)]
Changed 'unsigned size_t' to 'size_t'
Xinchen Hui [Thu, 28 Aug 2014 07:43:14 +0000 (15:43 +0800)]
Fixed segfaults after change size_t of "s"
Xinchen Hui [Thu, 28 Aug 2014 07:13:57 +0000 (15:13 +0800)]
Fixed zend extensions multipy-times loadable
Xinchen Hui [Thu, 28 Aug 2014 06:56:53 +0000 (14:56 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Thu, 28 Aug 2014 06:56:25 +0000 (14:56 +0800)]
Revert "Fixed incompatible pointer type"
This reverts commit
007406c775b527a334a0964a624810afeb599ed5 .
Dmitry Stogov [Thu, 28 Aug 2014 06:55:16 +0000 (10:55 +0400)]
LOAD_REGS() is not used anymore
Anatol Belski [Thu, 28 Aug 2014 06:55:05 +0000 (08:55 +0200)]
fix hash_pbkdf2()
Dmitry Stogov [Thu, 28 Aug 2014 06:31:13 +0000 (10:31 +0400)]
Fixed type
Xinchen Hui [Thu, 28 Aug 2014 05:20:43 +0000 (13:20 +0800)]
closesocket is defined in php_network.h
Xinchen Hui [Thu, 28 Aug 2014 05:18:55 +0000 (13:18 +0800)]
closesocket is already defined in main/php_network.h
Xinchen Hui [Thu, 28 Aug 2014 05:11:07 +0000 (13:11 +0800)]
Fixed iconv MINFO
Xinchen Hui [Thu, 28 Aug 2014 03:34:00 +0000 (11:34 +0800)]
Fixed incompatible pointer type
Tjerk Meesters [Thu, 28 Aug 2014 00:33:18 +0000 (08:33 +0800)]
Merged PR 785 - Fixed ZEND_INT_(MIN/MAX) constants in signed multiplication
ZEND_INT_MIN and ZEND_INT_MAX should be ZEND_LONG_MIN and ZEND_LONG_MAX respectively.
Dmitry Stogov [Wed, 27 Aug 2014 22:44:06 +0000 (02:44 +0400)]
Use 'const' qualifier for pointrs to code used at run-time (the code must not be changed)
Anatol Belski [Wed, 27 Aug 2014 22:16:32 +0000 (00:16 +0200)]
fix remaining 's' args for pgsql
Johannes Schlüter [Wed, 27 Aug 2014 22:09:14 +0000 (00:09 +0200)]
Fix compilation on systems without ecdh_curve
Anatol Belski [Wed, 27 Aug 2014 22:05:29 +0000 (00:05 +0200)]
fix remaining 's' args for openssl
Anatol Belski [Wed, 27 Aug 2014 21:55:09 +0000 (23:55 +0200)]
fixed remaining 's' args for ftp
Lior Kaplan [Wed, 27 Aug 2014 21:50:31 +0000 (00:50 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
Lior Kaplan [Wed, 27 Aug 2014 21:48:28 +0000 (00:48 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
Lior Kaplan [Wed, 27 Aug 2014 21:44:31 +0000 (00:44 +0300)]
config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
Based on http://git.savannah.gnu.org/cgit/config.git/commit/?id=
29900d3b
Anatol Belski [Wed, 27 Aug 2014 21:44:28 +0000 (23:44 +0200)]
fix linkinfo()
Lior Kaplan [Wed, 27 Aug 2014 21:37:01 +0000 (00:37 +0300)]
libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
Patch created using the following changes in libtool:
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
75ffb257
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
056889b8
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
bd998a7e
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
429d40a0
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=
8a8dfaec
Anatol Belski [Wed, 27 Aug 2014 21:14:54 +0000 (23:14 +0200)]
restore the old part of ezmlm_hash()