Xinchen Hui
5a5c855154
attempt to port oci
2015-02-03 22:17:25 +08:00
Xinchen Hui
64caa97e02
Fixed test fails
2015-02-03 22:09:37 +08:00
Xinchen Hui
2c842dfce0
Fixed shmop tests fails
2015-02-03 22:07:31 +08:00
Xinchen Hui
d4546601f3
Fixed mysql tests fails
2015-02-03 22:04:24 +08:00
Xinchen Hui
0d4255de30
Ported pgsql
2015-02-03 13:51:04 +08:00
Xinchen Hui
5c87488a70
Ported dba
2015-02-03 12:07:36 +08:00
Xinchen Hui
efc75061ed
Ported wddx
2015-02-03 12:02:28 +08:00
Xinchen Hui
2517b56cd1
Ported mcrypt
2015-02-03 11:58:11 +08:00
Xinchen Hui
d1559dac04
Ported enchant
2015-02-02 16:33:57 +08: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
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
263fb375bd
- Updated to version 2015.1 (2015a)
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
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
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
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
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
e8e0481755
Merge branch 'pull-request/994'
...
* pull-request/994:
Added test and possible fix for https://bugs.php.net/bug.php?id=67068
2015-01-31 23:12:00 -08:00
Stanislav Malyshev
d6b1865007
Merge branch 'pull-request/988'
...
* pull-request/988:
remove PHP4 extension structure compat
2015-01-31 23:11:18 -08:00
Stanislav Malyshev
dd15207dc5
Merge branch 'pull-request/945'
...
* pull-request/945:
Update zend_accelerator_hash.c
hashmap sizes
Wasted Shared Memory aboce 2Gb fix
2015-01-31 23:10:37 -08:00
Stanislav Malyshev
c408c80886
Merge branch 'pull-request/989'
...
* pull-request/989:
Fix a few tests and remove error/warning for *0
Fix spaces -> tabs
Add deprecated notice to invalid DES salts.
2015-01-31 22:04:39 -08:00
Stanislav Malyshev
141b14454c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
2015-01-31 21:50:08 -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
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
Stanislav Malyshev
457367e0b6
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:04:55 -08:00
Yasuo Ohgaki
d8803d8147
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed typo in comment
2015-02-01 05:15:27 +09: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