Christopher Jones
e39cc57bbd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Remove 550+ compile warnings on OS X
2014-08-29 08:48:56 -07:00
Christopher Jones
6fe0bdda9c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Remove 550+ compile warnings on OS X
2014-08-29 08:48:43 -07:00
Christopher Jones
9063188fad
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
2014-08-29 08:48:10 -07:00
Christopher Jones
88099a0a27
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.
2014-08-29 08:47:10 -07:00
Anatol Belski
d3fb1859f0
restore the old behavior for the assignment to string offset
2014-08-29 17:28:53 +02:00
Anatol Belski
a9c5dab1d0
revert the lstat part
2014-08-29 17:21:02 +02:00
Anatol Belski
f9b051241a
fix stat vs zend_stat
2014-08-29 13:43:40 +02:00
Anatol Belski
13ccda7249
fix implicit st_rdev element handling when negative value was passed
2014-08-29 13:30:53 +02:00
Anatol Belski
451856420c
data type fixes
2014-08-29 12:53:37 +02:00
Anatol Belski
34f536693c
avoid usage of 'type' before the null pointer check
2014-08-29 11:21:07 +02:00
Anatol Belski
e206409a8c
exclude log2 usage which requires C99 support
2014-08-29 10:55:55 +02:00
Lior Kaplan
e400b7b99f
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)
2014-08-29 11:44:45 +03:00
Lior Kaplan
13b45a36f0
Add missing CVE IDs for 5.6.0
2014-08-29 11:42:12 +03:00
Lior Kaplan
210e35a2fa
Align entiries format to "Fixed bug #..."
2014-08-29 11:42:12 +03:00
Lior Kaplan
49d6472f9f
Use #66356 instead of #66714 , as the latter is only a regression fix from the former.
2014-08-29 11:42:12 +03:00
Lior Kaplan
cd38d72eee
Add an entry for bug#66060 (fixed in 5.5.8)
2014-08-29 11:42:12 +03:00
Anatol Belski
c14b3d5d82
fixed path in test
2014-08-29 08:41:29 +02:00
Stanislav Malyshev
d637c2cac7
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
2014-08-28 23:13:24 -07:00
Stanislav Malyshev
08c63e2a56
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
2014-08-28 23:12:41 -07:00
Stanislav Malyshev
e55c641792
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
2014-08-28 23:11:55 -07:00
Stanislav Malyshev
b206b0e29d
fix NEWS for fcgi fix merge
2014-08-28 23:10:32 -07:00
David Zuelke
ee275e34c8
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:06:00 -07:00
Xinchen Hui
0763d6b98d
use zend_string_equals_ci
2014-08-29 13:19:14 +08:00
Xinchen Hui
49bd049b7e
Keep folder mark style in this file
2014-08-29 13:05:58 +08:00
Xinchen Hui
b2d2b965b2
resource type is int
2014-08-29 11:28:21 +08:00
Johannes Schlüter
6592706340
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
2014-08-29 01:34:46 +02:00
Nikita Popov
ae7e663330
Fix bug #67922
2014-08-29 00:18:38 +02:00
Andrea Faulds
389d285973
Special-case aliases, add warning comments to implementations
2014-08-29 00:10:52 +02:00
Anatol Belski
5fc0006d35
skip this if we can't check the uid
2014-08-28 22:22:38 +02:00
Anatol Belski
898e1570a2
fixed trim() and strtok() to work with big strings
2014-08-28 21:59:00 +02:00
Anatol Belski
8e05b9104b
fixed strip_tags() and hebrev() to work with big strings
2014-08-28 19:35:37 +02:00
Anatol Belski
d6faac2cb2
make array/object APIs accept large strings as values of elements/props
2014-08-28 19:17:47 +02:00
Anatol Belski
d6930c9a87
replace llabs with imaxabs
...
both are gcc built-in but imaxabs doesn't require C99 compat (see man)
2014-08-28 18:58:24 +02:00
Dmitry Stogov
c8ff3421a0
Duplicate array only if neccessary
2014-08-28 20:51:22 +04:00
Anatol Belski
7faac0267f
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
2014-08-28 17:39:03 +02:00
Anatol Belski
f4e04b9fb1
fix phar copy-on-write
2014-08-28 17:35:54 +02:00
Popa Adrian Marius
e41754b7d8
rename misleading define
2014-08-28 18:20:28 +03:00
Anatol Belski
9f1b68eda5
fix incompatible pointer
2014-08-28 17:03:41 +02:00
Anatol Belski
7f6d2b124b
fix format
2014-08-28 17:03:40 +02:00
Anatol Belski
d3bfbc079f
remove duplicate condition already present a line upper
2014-08-28 17:03:39 +02:00
Popa Adrian Marius
59286f89f7
solve conflicting type size_t vs int
2014-08-28 17:10:42 +03:00
Dmitry Stogov
3447d465af
Use better hash functions
2014-08-28 17:47:40 +04:00
Dmitry Stogov
234af84c04
Refactored optimizer (compile different opimizer passes separately, instead of including *.c file)
2014-08-28 17:23:12 +04:00
Anatol Belski
1c252d5dd4
use stddef.h definitions for uintptr_t and intptr_t
2014-08-28 13:07:47 +02:00
Anatol Belski
8e4e765f7e
better alignment, won 8 byte on 64 bit with default alignment
2014-08-28 12:12:24 +02:00
Anatol Belski
6890830ec0
fix number format
2014-08-28 12:07:39 +02:00
Anatol Belski
bf84517b64
fix dir separator
2014-08-28 11:56:27 +02:00
Anatol Belski
a502639412
remove the expression parts, which are always true
2014-08-28 11:38:23 +02:00
Anatol Belski
e831de3024
fix some types and unnecessary casts
2014-08-28 11:38:22 +02:00
Anatol Belski
0b04843573
fix type
2014-08-28 11:38:21 +02:00
