Yasuo Ohgaki
2983ef3c48
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:41:31 +09:00
Yasuo Ohgaki
853ae39d6e
Fixed bug #68063 Empty session IDs do still start sessions
2015-02-03 13:38:49 +09:00
Yasuo Ohgaki
665997bf16
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #61470 is fixed only in master
2015-02-03 12:26:25 +09:00
Yasuo Ohgaki
17beba686e
Bug #61470 is fixed only in master
2015-02-03 12:26:01 +09:00
Daniel Lowrey
f86600c167
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
ext/standard/file.c
2015-02-02 10:52:27 -05:00
Daniel Lowrey
f2f467bd96
Fixed bug #65272 : correctly set flock() out param in windows
2015-02-02 10:47:54 -05:00
Adam Harvey
05d591dfdf
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-02 11:31:54 +00:00
Adam Harvey
9d8b1170aa
Let's not assume bash is always /bin/bash.
2015-02-02 11:31:10 +00:00
Adam Harvey
db375cfd4d
Merge branch 'PHP-5.5' into PHP-5.6
2015-02-02 11:11:05 +00:00
Adam Harvey
a7b3abe4e6
json_decode() should generate a syntax error when given "".
...
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
2015-02-02 11:07:34 +00:00
Yasuo Ohgaki
675a12bbcf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:48 +09:00
Yasuo Ohgaki
fb803ff819
Add test for bug #61470 . It is already fixed.
2015-02-02 18:39:07 +09:00
Stanislav Malyshev
969e389121
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix sizeof size
2015-02-01 12:41:33 -08:00
Stanislav Malyshev
0bfcc2829c
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
- Updated to version 2015.1 (2015a)
2015-02-01 12:41:10 -08:00
Stanislav Malyshev
f66f5b2ffa
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix sizeof size
2015-02-01 12:41:00 -08:00
Stanislav Malyshev
7efbd70b03
fix sizeof size
2015-02-01 12:40:38 -08:00
Derick Rethans
263fb375bd
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:21 +00:00
Derick Rethans
440cefd5a9
Empty merge
2015-02-01 18:31:21 +00:00
Derick Rethans
4d28d12f86
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:19 +00:00
Stanislav Malyshev
ac3a4e4200
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66479 : Wrong response to FCGI_GET_VALUES
2015-02-01 00:36:21 -08:00
Frank Stolle
6a905a9a3c
Fix #66479 : Wrong response to FCGI_GET_VALUES
...
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.
Conflicts:
sapi/cgi/fastcgi.c
2015-02-01 00:35:23 -08:00
Stanislav Malyshev
463611714c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
2015-02-01 00:09:04 -08:00
Martin Jansen
de31324c22
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
...
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to also have
the loader disabled.
With this change the loader is explicitely enabled in the request init
phase.
2015-02-01 00:08:35 -08:00
Stanislav Malyshev
c5526291ce
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix group name handling
2015-01-31 23:47:25 -08:00
Stanislav Malyshev
e5e251b023
fix group name handling
2015-01-31 23:47:03 -08:00
Stanislav Malyshev
55d5811f85
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix TSRM
2015-01-31 23:34:44 -08:00
Stanislav Malyshev
d82424b46f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix TSRM
2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78
fix TSRM
2015-01-31 23:34:14 -08:00
Stanislav Malyshev
2560a21d41
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add NEWS
2015-01-31 23:20:14 -08:00
Stanislav Malyshev
380741daa4
add NEWS
2015-01-31 23:19:23 -08:00
Stanislav Malyshev
b64cafdb9e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:17:24 -08:00
Danack
dbc0a80b23
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:13:55 -08:00
Stanislav Malyshev
6a960b6d1b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
2cdbd3537f
use right sizeof for memset
2015-01-31 21:30:58 -08:00
Stanislav Malyshev
41bdd6e7cc
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Add mitigation for CVE-2015-0235 (bug #68925 )
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:12:20 -08:00
Stanislav Malyshev
882a375dba
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Yasuo Ohgaki
d9a9afa499
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed typo in comment
2015-02-01 05:14:56 +09:00
Yasuo Ohgaki
c8a12508c7
Fixed typo in comment
2015-02-01 05:14:27 +09:00
Yasuo Ohgaki
7b06cc8d22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Use bash rather than sh
2015-01-29 15:27:08 +09:00
Yasuo Ohgaki
d463ddd3c7
Use bash rather than sh
2015-01-29 15:21:17 +09:00
Yasuo Ohgaki
5f28622e09
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:29:11 +09:00
Yasuo Ohgaki
abf9e2ea09
Fixed Bug #68941 mod_files.sh is a bash-script
2015-01-29 09:25:28 +09:00
Xinchen Hui
c06f1590a9
Update News
2015-01-29 00:01:13 +08:00
Xinchen Hui
5208113ad1
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-29 00:01:00 +08:00
Xinchen Hui
b2cf3f064b
Fixed bug #68901 (use after free)
2015-01-29 00:00:09 +08:00
Xinchen Hui
b881de9937
Merge branch 'PHP-5.5' into PHP-5.6
2015-01-27 22:25:45 +08:00