Xinchen Hui
|
6c7d3ce09a
|
Fixed pgsql tests
|
2015-02-03 23:50:58 +08:00 |
|
Xinchen Hui
|
38829b3b4b
|
Merge branch 'master' into resource-api
|
2015-02-03 23:01:48 +08:00 |
|
Dmitry Stogov
|
6720716682
|
Optimize class lookup
|
2015-02-03 17:39:05 +03:00 |
|
Xinchen Hui
|
22d8393bfa
|
Merge branch 'fix-typo-new-output-api' of https://github.com/n0ts/php-src
|
2015-02-03 22:29:25 +08:00 |
|
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 |
|
Yasuo Ohgaki
|
feef180e6c
|
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.
Conflicts:
main/main.c
tests/basic/encoding.phpt
|
2015-02-03 19:00:13 +09:00 |
|
Yasuo Ohgaki
|
436ba1c488
|
Fixed Bug #67988 htmlspecialchars() does not respect default_charset specified by ini_set.
|
2015-02-03 18:52:46 +09:00 |
|
Yasuo Ohgaki
|
30b4a32e09
|
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed Bug #65199 pg_copy_from() modifies input array variable
Conflicts:
ext/pgsql/pgsql.c
|
2015-02-03 15:40:59 +09:00 |
|
Yasuo Ohgaki
|
36f73412c1
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Bug #65199 pg_copy_from() modifies input array variable
|
2015-02-03 15:27:19 +09:00 |
|
Yasuo Ohgaki
|
f8a8ccaba2
|
Fixed Bug #65199 pg_copy_from() modifies input array variable
|
2015-02-03 15:26:02 +09:00 |
|
Xinchen Hui
|
0d4255de30
|
Ported pgsql
|
2015-02-03 13:51:04 +08:00 |
|
Yasuo Ohgaki
|
1aa6242dcf
|
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
Conflicts:
ext/session/mod_files.c
|
2015-02-03 14:07:23 +09:00 |
|
Yasuo Ohgaki
|
4dd7851208
|
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
|
2015-02-03 14:04:03 +09:00 |
|
Yasuo Ohgaki
|
b41a6c6f05
|
Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
|
2015-02-03 14:02:58 +09:00 |
|
Yasuo Ohgaki
|
5afe554d32
|
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68063 Empty session IDs do still start sessions
Conflicts:
ext/session/session.c
ext/session/tests/bug61470.phpt
|
2015-02-03 13:49:14 +09:00 |
|
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 |
|
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 |
|
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 |
|
Yasuo Ohgaki
|
e93042998a
|
Fixed bug #61470 - session_regenerate_id() does not create session file.
Made session_regenerate_id() raise error for wrong usage.
|
2015-02-03 12:23:00 +09:00 |
|
Yasuo Ohgaki
|
92576c7c49
|
XFAIL broken test for now.
Partially fixed test session.save_path difference.
|
2015-02-03 03:05:03 +09:00 |
|
Dmitry Stogov
|
e375ba877a
|
Fixed "delayed" compilation
|
2015-02-02 20:44:16 +03:00 |
|
Daniel Lowrey
|
37ace4ad89
|
Merge branch 'PHP-5.6'
Conflicts:
ext/standard/file.c
|
2015-02-02 10:58:39 -05: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
|
fea4c22266
|
Merge branch 'PHP-5.6'
|
2015-02-02 11:32:03 +00: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
|
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 |
|