Anatol Belski
cd18b5884b
Merge remote-tracking branch 'php/master'
2014-08-20 23:27:26 +02:00
Anatol Belski
888ef26cc5
yet trivial fixes
2014-08-20 22:54:00 +02:00
Anatol Belski
6d54e89916
Merge remote-tracking branch 'php/master'
2014-08-20 21:29:49 +02:00
Dmitry Stogov
6b5b5094d3
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
fix directory separator in test
2014-08-20 23:29:21 +04:00
Anatol Belski
b3198b6845
more fixes to ext/iconv
2014-08-20 21:29:04 +02:00
Dmitry Stogov
8cda420ff4
Fixed ext/pdo_*/tests/pdo_005.phpt tests failure
2014-08-20 23:28:32 +04:00
Anatol Belski
4b337a898b
fix directory separator in test
2014-08-20 21:27:39 +02:00
Dmitry Stogov
cf09bc7825
Fixed bug #67874 (Crash in array_map())
2014-08-20 22:06:15 +04:00
Dmitry Stogov
9507aa99fc
Fixed immutable array support
2014-08-20 21:42:49 +04:00
Anatol Belski
49b65d0d65
fixed sysvshm
2014-08-20 09:44:43 -07:00
Anatol Belski
be1b1e7b41
fix index type
2014-08-20 18:21:57 +02:00
Anatol Belski
66e7090e61
Merge remote-tracking branch 'php/master'
2014-08-20 18:19:37 +02:00
Anatol Belski
4498f93c0e
more fixes to ext/spl
2014-08-20 18:06:01 +02:00
Anatol Belski
8e8a30654e
fix zpp
2014-08-20 17:56:07 +02:00
Anatol Belski
5eefbce083
fix types in virtual cwd
2014-08-20 17:49:52 +02:00
Dmitry Stogov
d37820ff5b
Introduced get_resources() function.
...
It may be used for debugging and testing to identify resource leaks.
Changed ext/standard/tests/http/bug60570.phpt to use this function instead of unsafe attempt to catch resource leaks using get_memory_usage()
2014-08-20 18:29:44 +04:00
Anatol Belski
e08fa78a54
fixed count_chars()
2014-08-20 15:51:45 +02:00
Anatol Belski
38c4db54dd
fixed nl2br
2014-08-20 15:32:24 +02:00
Remi Collet
634d6ab142
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
2014-08-20 15:17:30 +02:00
Remi Collet
42e1df9b01
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
2014-08-20 15:17:20 +02:00
Remi Collet
825ddbb3c6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
2014-08-20 15:17:05 +02:00
Remi Collet
9185cfd539
NEWS
2014-08-20 15:16:53 +02:00
Anatol Belski
33d2442a32
fix php_sapi_filter
2014-08-20 15:14:25 +02:00
Remi Collet
28f71e18d1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed variable corruption under win x64
2014-08-20 15:11:19 +02:00
Remi Collet
f4120e53c8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed variable corruption under win x64
2014-08-20 15:10:54 +02:00
Remi Collet
6d19358ae0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed variable corruption under win x64
2014-08-20 15:10:02 +02:00
Anatol Belski
20941b71aa
fixed variable corruption under win x64
2014-08-20 15:08:52 +02:00
Anatol Belski
745a71be33
yet more fixes to zpp
2014-08-20 14:46:14 +02:00
Dmitry Stogov
04aa96d28d
Removed a hack that allowed passing of function return value by reference depending on value of reference-counter (Fixed Zend/tests/bug35393.phpt test failure)
2014-08-20 15:04:40 +04:00
Dmitry Stogov
3d90fdf79c
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
phpdbg doesn't build due to the phpng merge, distable its build & test runs
phpdbg doesn't build due to the phpng merge, distable it
2014-08-20 15:04:03 +04:00
Lior Kaplan
a43ddea897
phpdbg doesn't build due to the phpng merge, distable its build & test runs
2014-08-20 13:33:37 +03:00
Lior Kaplan
d91b1ef7b8
phpdbg doesn't build due to the phpng merge, distable it
2014-08-20 12:13:36 +03:00
Dmitry Stogov
c1b5fde606
Reverted incorrectly changed test. Now it's the same as in PHP-5.6.
2014-08-20 12:03:47 +04:00
Anatol Belski
fdbbe5fa30
fixed some incompatible types
2014-08-20 09:52:23 +02:00
Anatol Belski
f27c52d846
fixed incompatible types usage
2014-08-20 09:15:00 +02:00
Anatol Belski
07359785c3
Merge remote-tracking branch 'php/master'
2014-08-20 08:48:43 +02:00
Dmitry Stogov
8ea7e4e4e2
fixed memory leak
2014-08-20 10:43:37 +04:00
Tjerk Meesters
285934a4c9
Fixed off-by-one memory allocation that could lead to invalid memory reads on strlen()
...
Always properly null terminate strings before ini parsing
Remove unnecessary memset() statements
2014-08-20 12:13:19 +08:00
Andrea Faulds
90ed6d0ec6
NEWS and UPGRADING
2014-08-20 00:38:33 +01:00
Andrea Faulds
115698d832
Merge branch 'master' of git.php.net:php-src
2014-08-20 00:34:12 +01:00
Andrea Faulds
376e545b01
Merge branch 'fpmConfFix' of github.com:DaveRandom/php-src
2014-08-20 00:28:43 +01:00
Lior Kaplan
7cba6e0e82
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Add NEWS entry for bug #67492
Add NEWS entry for bug #67730
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
2014-08-20 01:36:56 +03:00
Lior Kaplan
96f812e411
Add NEWS entry for bug #67730
2014-08-20 01:34:57 +03:00
Anatol Belski
53a8d8e627
Merge remote-tracking branch 'php/master'
2014-08-20 00:34:17 +02:00
Anatol Belski
476bdbf85b
ported opcache
2014-08-20 00:23:37 +02:00
Lior Kaplan
ac0c864c63
Add CVE ID for bug #67539
2014-08-20 01:18:15 +03:00
Lior Kaplan
6aa7466492
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add NEWS entry for bug #67492
Add NEWS entry for bug #67730
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
2014-08-20 01:16:04 +03:00
Lior Kaplan
d382d6f3dc
Add NEWS entry for bug #67492
...
Included in 5.5.14 with commit d9c5a1d
2014-08-20 01:10:38 +03:00
Lior Kaplan
9360b6eeee
Add NEWS entry for bug #67730
2014-08-20 01:05:22 +03:00
Lior Kaplan
aa6dc6c108
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
2014-08-20 01:01:23 +03:00
