34eb787828
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
2012-10-04 08:39:21 +01:00
9e3396b85d
5.4.9-dev
2012-10-03 18:36:17 -07:00
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
64c09f68ec
PHP-5.3 branch is 5.3.19 now
2012-10-04 02:35:42 +02:00
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
92a46fe07e
reverted the previous fix for libpng include
2012-10-02 09:57:44 +02:00
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
0165eec1ea
fixed include checks for libpng under win
2012-10-02 09:39:34 +02:00
60a280936e
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-02 00:30:49 +08:00
4f860a4412
Avoding superfluous function call
2012-10-02 00:28:38 +08:00
af0c22537a
Add test for #35895
2012-10-02 00:27:35 +08:00
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
139ac42bec
Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed)
2012-10-01 22:42:22 +08:00
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
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
d3c37f0937
add news for --offline
2012-09-30 19:41:41 -07:00
dd093ac12a
add --offline option to run-tests command
2012-09-30 19:40:57 -07:00
79db2855f7
Bug #63147 : SKIP_ONLINE_TESTS, for getmxrr
2012-09-30 19:40:52 -07:00
71c61921f3
Bug #63147 : introduce SKIP_ONLINE_TESTS, for gethostbyname
2012-09-30 19:40:43 -07:00
189b99aee1
gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
2012-09-30 19:40:36 -07:00
457844a226
add bug #63162
2012-09-30 19:27:12 -07:00
bf064112b7
fix test and move to proper place
2012-09-30 19:24:42 -07:00
ad570991cf
synergy ftl. Removed duplicate fields.
2012-09-30 19:20:51 -07:00
6ec6b208e8
adding test phpt
2012-09-30 19:20:44 -07:00
491b1efacb
Bug #63162 - parse_url does not matches password component
2012-09-30 19:20:37 -07:00
f879e1162f
fix news
2012-09-30 19:08:24 -07:00
dedbba4e5b
Eliminate process running requirement of dump_bt in .gdbinit
...
Most of the time scope are avaible, but if not, it will be hard to get them,
since we can't call function if no proccess running. try to get class name
if we can.
2012-10-01 03:10:15 +08:00
175a9de47f
Fix test
2012-10-01 00:15:47 +08:00
752280d4d2
Add missing ____executor_globals in dump_bt if needed
2012-09-30 23:05:03 +08:00
b3469560f3
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 04:31:29 +00:00
613674c7a2
Implemented FR #63188 (Display class name when debugging with gdb macro zbacktrace)
2012-09-30 03:16:26 +08:00
36c10242cd
Remove meaningless md5 string && Attempt to fix #63184
2012-09-29 14:38:29 +08:00
f495e93057
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Update NEWS
2012-09-28 15:28:37 -04:00
ec36192390
Update NEWS
2012-09-28 15:26:53 -04:00
a2a8220127
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
FD_ZERO file descriptors before calling curl_multi_fdset
2012-09-28 15:21:33 -04:00
936553d666
FD_ZERO file descriptors before calling curl_multi_fdset
...
As per curl documentation http://curl.haxx.se/libcurl/c/curl_multi_fdset.html
we need to FD_ZERO file descriptors before calling the curl_multi_fdset function
2012-09-28 15:21:03 -04:00
34c3985979
Add missing NEWS entry
2012-09-28 11:22:16 +02:00
b530f53c67
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #62216
2012-09-28 11:21:12 +02:00
4358e90a8f
Merge branch 'bug62216' into PHP-5.3
...
* bug62216:
Fixed bug #62216
2012-09-28 11:20:47 +02:00
bb02fd5772
Fixed bug #62216
...
Add PID to php-fpm init.d script
2012-09-28 11:18:08 +02:00
61cf929db3
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-28 15:03:52 +08:00
9ef925b351
- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
2012-09-28 01:25:51 +02:00
151b16cf7f
- Fixed bug #62887 (Only /status?plain&full gives "last request cpu")
2012-09-28 01:24:52 +02:00
be043ab6d0
Merge branch 'fuckgit' into PHP-5.4
...
* fuckgit:
- Fixed bug #62947 (Unneccesary warnings on FPM)
- Fixed bug #63085 (Systemd integration and daemonize)
Conflicts:
sapi/fpm/config.m4
2012-09-28 01:19:01 +02:00
72f3457161
- Fixed bug #62947 (Unneccesary warnings on FPM)
2012-09-28 01:08:48 +02:00
e31553c204
- Fixed bug #62947 (Unneccesary warnings on FPM)
2012-09-28 01:08:08 +02:00
64a0e7cdc2
- Fixed bug #63085 (Systemd integration and daemonize)
2012-09-28 00:53:05 +02:00
2259a8f18b
- add missing php-fpm.service.in
2012-09-28 00:47:56 +02:00
b2f4e686f0
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #63085 (Systemd integration and daemonize)
- Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
Conflicts:
sapi/fpm/config.m4
2012-09-28 00:39:29 +02:00
851a04bb7b
- Fixed bug #63085 (Systemd integration and daemonize)
2012-09-28 00:33:05 +02:00
Derick Rethans