clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,463 Commits 491 Branches 1,363 Tags 844 MiB
3aea1dca06
Commit Graph

84463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
3aea1dca06 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
 2014-08-30 04:06:25 +02:00
Anatol Belski
daefca44b5 updated NEWS 2014-08-30 04:06:00 +02:00
Anatol Belski
f4ebeead5d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67731 finfo::file() returns invalid mime type for binary files
 2014-08-30 04:05:42 +02:00
Anatol Belski
c301467f9b Fixed bug #67731 finfo::file() returns invalid mime type for binary files 2014-08-30 04:04:42 +02:00
Johannes Schlüter
ca042bb18c Use global symbol table for completion after $ in readline. 2014-08-30 00:02:31 +02:00
Nikita Popov
f1c2017851 Don't depend on exact parse error messages in assert tests 2014-08-29 22:07:25 +02:00
Nikita Popov
b73bea9cc8 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.
 2014-08-29 21:53:09 +02:00
Nikita Popov
545fd5168e 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.
 2014-08-29 21:02:10 +02:00
Nikita Popov
25d57aace3 Introduce optional_expr 2014-08-29 18:51:58 +02:00
Nikita Popov
c6a5c3c6c5 Remove parenthesis_expr 
This was necessary previously to handle yields, now it only clutters
up the grammar.
 2014-08-29 18:46:46 +02:00
Nikita Popov
7722d2c584 Simplify argument production 2014-08-29 18:42:05 +02:00
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