Adam Harvey
9e20b64a5b
Merge branch 'PHP-5.6'
2015-02-02 11:12:27 +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
c7eea5a79b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Add test for bug #61470 . It is already fixed.
2015-02-02 18:41:25 +09: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
n0ts
54a5237ec9
Fix typo php_end_ob_buffer
2015-02-02 18:01:50 +09:00
Anatol Belski
79c9dc75de
rely on macros from stdint for int constants on 64 bit
...
32 bit ones are already in use
2015-02-02 09:39:33 +01:00
Xinchen Hui
d1559dac04
Ported enchant
2015-02-02 16:33:57 +08:00
Yasuo Ohgaki
f248df9003
Cleanup trans sid code. Behavior is unchanged.
...
Fixed possible injections. Escape values usually internal safe values.
2015-02-02 17:06:16 +09:00
Xinchen Hui
7b41f4a41a
Ported ldap
2015-02-02 15:05:20 +08:00
Xinchen Hui
e98caf27ea
found type is unnecessary
2015-02-02 14:45:19 +08:00
Xinchen Hui
50ae5b31b4
Ported imap
2015-02-02 14:35:50 +08:00
Xinchen Hui
f1981365f5
Fixed #68966 (php7 make file ext/session/mod_mm.lo failed)
2015-02-02 14:24:41 +08:00
Xinchen Hui
7ec8eb380d
Use resource directly
2015-02-02 13:56:20 +08:00
Xinchen Hui
38efb690c0
Ported ftp
2015-02-02 13:53:03 +08:00
Xinchen Hui
942809909e
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
Xinchen Hui
c9e44dc2df
Revert "Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"""
...
This reverts commit e78dd7ade2
.
2015-02-02 10:32:26 +08:00
Stanislav Malyshev
bf55a4e223
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix sizeof size
2015-02-01 12:42:00 -08: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
437719f7cc
- Updated to version 2015.1 (2015a)
2015-02-01 18:31:23 +00:00
Derick Rethans
fa729f89e5
Empty merge
2015-02-01 18:31:22 +00: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
c752e1b786
Merge branch 'pull-request/1032'
...
* pull-request/1032:
do_fstat changes
2015-02-01 00:56:27 -08:00
Stanislav Malyshev
b3efc0fb6a
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #66479 : Wrong response to FCGI_GET_VALUES
Conflicts:
sapi/cgi/fastcgi.c
2015-02-01 00:37:14 -08:00
Stanislav Malyshev
c440043de5
Merge branch 'pull-request/884'
...
* pull-request/884:
Fix #66479 : Wrong response to FCGI_GET_VALUES
2015-02-01 00:36:53 -08: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
62d6f91b3e
Merge branch 'pull-request/1011'
...
* pull-request/1011:
Fix for a previous commit. i read it as size_t, notssize_t.
Remove useless tests
2015-02-01 00:21:47 -08:00
Stanislav Malyshev
c0237617e1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
Conflicts:
ext/libxml/libxml.c
2015-02-01 00:09:44 -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
d893814b58
Merge branch 'pull-request/1019'
...
* pull-request/1019:
Fix typos
Fix bug #64938 : libxml_disable_entity_loader setting is shared between threads
2015-02-01 00:03:26 -08:00
Joshua Rogers
d492bc8b6b
Fix for a previous commit. i read it as size_t, notssize_t.
2015-02-01 19:02:25 +11:00
Stanislav Malyshev
0be7d000b4
Merge branch 'pull-request/935'
...
* pull-request/935:
Update config.guess and config.sub
2015-01-31 23:59:53 -08:00
Stanislav Malyshev
911f0ea417
Merge branch 'pull-request/1012'
...
* pull-request/1012:
Fix uninitalized variables reads. See CWE-457 for more info.
2015-01-31 23:52:10 -08:00
Stanislav Malyshev
50703c900f
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix group name handling
Conflicts:
main/streams/plain_wrapper.c
2015-01-31 23:48:08 -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
Joshua Rogers
f8bf646fc4
do_fstat changes
...
Check return values of 'do_fstat' function in all places.
2015-02-01 18:47:09 +11:00
Stanislav Malyshev
e5e251b023
fix group name handling
2015-01-31 23:47:03 -08:00
Stanislav Malyshev
87d8e9208c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix TSRM
Conflicts:
ext/standard/dns.c
2015-01-31 23:35:11 -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
b68e7bd7ba
Merge branch 'pull-request/1040'
...
* pull-request/1040:
Added two missing opcache ini directives (restrict_api and mmap_base)
2015-01-31 23:24:30 -08:00