Xinchen Hui
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
b17039c737
Remove executable permission on phpt
2012-10-10 10:32:58 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
45e938ec34
Remove executable permission on phpt
2012-10-10 10:31:53 +08:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +08:00
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
Xinchen Hui
14bfd3126c
Merge branch 'PHP-5.4'
2012-10-09 13:16:53 +08:00
Xinchen Hui
931571260b
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:15:18 +08:00
Xinchen Hui
45e0d452c5
Fixed bug #63235 (buffer overflow in use of SQLGetDiagRec)
2012-10-09 13:13:51 +08:00
Xinchen Hui
6cd6a74c5a
Merge branch 'PHP-5.4'
2012-10-08 23:00:57 +08:00
Xinchen Hui
67611c67fa
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
2012-10-08 22:59:52 +08:00
Stanislav Malyshev
531e2533dd
Use zend_execute_internal always to call internal functions
2012-10-05 08:14:20 +02:00
Stanislav Malyshev
bda93f5405
use zend_execute_internal
2012-10-04 22:43:13 -07:00
Anatoliy Belsky
d5494d5e24
Merge branch 'PHP-5.4'
...
* PHP-5.4:
exposing the libxpm version in phpinfo
5.4.9-dev
Conflicts:
NEWS
configure.in
main/php_version.h
2012-10-04 18:24:42 +02:00
Anatoliy Belsky
9a99426e80
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
exposing the libxpm version in phpinfo
2012-10-04 18:21:07 +02:00
Anatoliy Belsky
5d9fb8ffeb
exposing the libxpm version in phpinfo
2012-10-04 18:20:02 +02:00
Andrey Hristov
713a3fc58c
update
2012-10-04 13:40:23 +02:00
Derick Rethans
b004a04f0a
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2012-10-04 08:39:34 +01:00
Derick Rethans
34eb787828
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2012-10-04 08:39:21 +01:00
Derick Rethans
61bee020e1
Merge branch 'master' of git.php.net:/php-src
2012-10-04 08:38:56 +01:00
Stanislav Malyshev
9e3396b85d
5.4.9-dev
2012-10-03 18:36:17 -07:00
Johannes Schlüter
9b2303afd6
Merge branch 'PHP-5.4'
2012-10-04 02:37:27 +02:00
Johannes Schlüter
5bbc489527
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
configure.in
main/php_version.h
2012-10-04 02:37:04 +02:00
Johannes Schlüter
64c09f68ec
PHP-5.3 branch is 5.3.19 now
2012-10-04 02:35:42 +02:00
Andrey Hristov
06dfb96bf5
add a check for libmysql
2012-10-03 14:14:59 +02:00
Andrey Hristov
3262de2f62
Merge branch 'master' of ssh://git.php.net/php-src
2012-10-03 14:03:05 +02:00
Andrey Hristov
4c9e222f99
if ssl has been switched on transmit clear-text password
2012-10-03 14:02:33 +02:00
Anatoliy Belsky
eea88c58db
Merge branch 'PHP-5.4'
...
* PHP-5.4:
reverted the previous fix for libpng include
2012-10-02 10:03:03 +02:00
Anatoliy Belsky
26e492f2f3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
reverted the previous fix for libpng include
2012-10-02 10:00:09 +02:00
Anatoliy Belsky
92a46fe07e
reverted the previous fix for libpng include
2012-10-02 09:57:44 +02:00
Anatoliy Belsky
6d1f81ebc0
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed include checks for libpng under win
2012-10-02 09:41:24 +02:00
Anatoliy Belsky
45351eaab4
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fixed include checks for libpng under win
2012-10-02 09:40:42 +02:00
Anatoliy Belsky
0165eec1ea
fixed include checks for libpng under win
2012-10-02 09:39:34 +02:00
Xinchen Hui
62fa875f3e
Merge branch 'PHP-5.4'
2012-10-02 00:31:47 +08:00
Xinchen Hui
60a280936e
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-02 00:30:49 +08:00
Xinchen Hui
4f860a4412
Avoding superfluous function call
2012-10-02 00:28:38 +08:00
Xinchen Hui
af0c22537a
Add test for #35895
2012-10-02 00:27:35 +08:00
Xinchen Hui
2ccae0ee75
Merge branch 'PHP-5.4'
2012-10-02 00:05:25 +08:00
Xinchen Hui
8e9805bb79
Now we can set the tsrm_ls manually
...
get(ZTS build):
(gdb) zbacktrace
You can't do that without a process to debug.
(gdb) set_ts 0x4112500
(gdb) zbacktrace
[0x2b232e83a1d8] call_user_func(array(2)[0x2b232e879528],
array(1)[0x2b232e878fa0]) /tmp/1.php:4
[0x7fffcb2efd80] A->__call("xxx", array(1)[0x2b232e878fa0])
2012-10-02 00:02:08 +08:00
Xinchen Hui
a81d431068
Merge branch 'PHP-5.4'
2012-10-01 22:45:15 +08:00
Xinchen Hui
139ac42bec
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
2012-10-01 22:42:22 +08:00
Stanislav Malyshev
0a3b6e4ee9
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Eliminate process running requirement of dump_bt in .gdbinit
Add missing ____executor_globals in dump_bt if needed
Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)
2012-09-30 20:32:04 -07:00
Stanislav Malyshev
c95fd5f758
Merge branch 'pull-request/209' into PHP-5.4
...
* pull-request/209:
Eliminate process running requirement of dump_bt in .gdbinit
Add missing ____executor_globals in dump_bt if needed
Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)
2012-09-30 20:31:36 -07:00
Stanislav Malyshev
e3e3fba66d
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
2012-09-30 20:21:11 -07:00
Stanislav Malyshev
40bb9254c5
Merge branch 'pull-request/210' into PHP-5.4
...
* pull-request/210:
Fix bugs 62561,62896 (Modifying DateTime::__construct,date_create adds an hour) Prevent a unix timestamp, which is always GMT when being parsed, from taking on the local timezones DST flag.
2012-09-30 20:19:36 -07:00
