]>
granicus.if.org Git - php/log
Carlos André Ferrari [Sat, 5 Jul 2014 17:45:03 +0000 (14:45 -0300)]
GD: imagepalettetotruecolor tests
Stanislav Malyshev [Fri, 25 Jul 2014 05:58:06 +0000 (22:58 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Fixed Bug #67538 (SPL Iterators use-after-free)
Stanislav Malyshev [Fri, 25 Jul 2014 05:55:39 +0000 (22:55 -0700)]
update NEWS
Xinchen Hui [Wed, 2 Jul 2014 09:57:42 +0000 (17:57 +0800)]
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Xinchen Hui [Wed, 2 Jul 2014 09:45:09 +0000 (17:45 +0800)]
Fixed Bug #67538 (SPL Iterators use-after-free)
Xinchen Hui [Fri, 25 Jul 2014 02:52:27 +0000 (10:52 +0800)]
Add CVE no
Johannes Schlüter [Thu, 24 Jul 2014 16:00:58 +0000 (18:00 +0200)]
BFN
Johannes Schlüter [Thu, 24 Jul 2014 16:00:06 +0000 (18:00 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Dmitry Saprykin [Thu, 24 Jul 2014 15:58:39 +0000 (17:58 +0200)]
Fix bug #67496 Save command history when exiting interactive shell with control-c
Johannes Schlüter [Thu, 24 Jul 2014 14:58:05 +0000 (16:58 +0200)]
BFN
Johannes Schlüter [Thu, 24 Jul 2014 14:56:05 +0000 (16:56 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 24 Jul 2014 14:53:51 +0000 (16:53 +0200)]
Fix bug #55496 Interactive mode doesn't force a newline before the prompt
Anatol Belski [Mon, 21 Jul 2014 12:46:57 +0000 (14:46 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix nmake snap when ext name is different in target dll
Anatol Belski [Mon, 21 Jul 2014 12:45:49 +0000 (14:45 +0200)]
fix nmake snap when ext name is different in target dll
Lior Kaplan [Sun, 20 Jul 2014 22:47:19 +0000 (01:47 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Update NEWS
Lior Kaplan [Sun, 20 Jul 2014 22:45:36 +0000 (01:45 +0300)]
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Remi Collet [Sun, 20 Jul 2014 09:14:43 +0000 (11:14 +0200)]
See bug #67635
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
Remi Collet [Sat, 19 Jul 2014 16:46:17 +0000 (18:46 +0200)]
NEWS
Remi Collet [Sat, 19 Jul 2014 16:42:40 +0000 (18:42 +0200)]
improve previous, add message during configure
Remi Collet [Sat, 19 Jul 2014 16:40:20 +0000 (18:40 +0200)]
Fixed bug #67635 php links to systemd libraries without using pkg-config
Patch from pacho at gentoo dot org
Rely on pkg-config for systemd >= 209
Failback on old check
Xinchen Hui [Sat, 19 Jul 2014 09:19:01 +0000 (17:19 +0800)]
Improve fix for #66608
Xinchen Hui [Sat, 19 Jul 2014 07:30:50 +0000 (15:30 +0800)]
Fixed segfault with empty break
Xinchen Hui [Sat, 19 Jul 2014 05:12:26 +0000 (13:12 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Xinchen Hui [Sat, 19 Jul 2014 04:53:34 +0000 (12:53 +0800)]
New added opcodes don't need to be resloved
Yasuo Ohgaki [Sat, 19 Jul 2014 01:12:28 +0000 (10:12 +0900)]
Update NEWS
Yasuo Ohgaki [Sat, 19 Jul 2014 01:11:42 +0000 (10:11 +0900)]
Update NEWS
Yasuo Ohgaki [Sat, 19 Jul 2014 00:53:04 +0000 (09:53 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
Yasuo Ohgaki [Sat, 19 Jul 2014 00:52:01 +0000 (09:52 +0900)]
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
Anatol Belski [Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented copy libs of core exts in phpize mode
Anatol Belski [Fri, 18 Jul 2014 16:38:57 +0000 (18:38 +0200)]
implemented copy libs of core exts in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:40:53 +0000 (11:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix copy the ext dll into the prefix path in phpize mode
fix default prefix in phpize mode
fix file with zero size usage in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:39:38 +0000 (11:39 +0200)]
fix copy the ext dll into the prefix path in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:36:44 +0000 (11:36 +0200)]
fix default prefix in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:35:32 +0000 (11:35 +0200)]
fix file with zero size usage in phpize mode
Xinchen Hui [Fri, 18 Jul 2014 07:45:56 +0000 (15:45 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Xinchen Hui [Fri, 18 Jul 2014 07:45:31 +0000 (15:45 +0800)]
Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
Lior Kaplan [Thu, 17 Jul 2014 20:04:23 +0000 (23:04 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Enable build without atoll (e.g old AIX flavours)
Lior Kaplan [Thu, 17 Jul 2014 19:58:36 +0000 (22:58 +0300)]
Enable build without atoll (e.g old AIX flavours)
Anatol Belski [Thu, 17 Jul 2014 19:48:46 +0000 (21:48 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented usage of the non core ext deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 19:47:15 +0000 (21:47 +0200)]
implemented usage of the non core ext deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 07:26:46 +0000 (09:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented force usage of generated .h and .js deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 07:25:57 +0000 (09:25 +0200)]
implemented force usage of generated .h and .js deps in phpize mode
Anatol Belski [Wed, 16 Jul 2014 19:34:19 +0000 (21:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
basic routines for phpize mode to
Anatol Belski [Wed, 16 Jul 2014 19:33:07 +0000 (21:33 +0200)]
basic routines for phpize mode to
- generate headers for non core ext defines
- generate js deps for non core exts
Rasmus Lerdorf [Mon, 14 Jul 2014 15:21:27 +0000 (08:21 -0700)]
This test depends on expose_php being on
Rasmus Lerdorf [Fri, 11 Jul 2014 17:59:02 +0000 (10:59 -0700)]
Test output relies on expose_php being on
Rasmus Lerdorf [Fri, 11 Jul 2014 17:29:40 +0000 (10:29 -0700)]
1.2 is a problematic float to print out
Lower the default display precision for this test
Rasmus Lerdorf [Fri, 11 Jul 2014 16:12:32 +0000 (09:12 -0700)]
The test output is dependent on expose_php ini
Anatol Belski [Mon, 14 Jul 2014 07:53:16 +0000 (09:53 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
added headers install to phpize mode
Anatol Belski [Mon, 14 Jul 2014 07:52:39 +0000 (09:52 +0200)]
added headers install to phpize mode
Tjerk Meesters [Sat, 12 Jul 2014 07:09:32 +0000 (15:09 +0800)]
Updated NEWS for #67594
Tjerk Meesters [Sat, 12 Jul 2014 04:45:50 +0000 (12:45 +0800)]
Fix #67594 - invisible colon should be stripped off header name
Tjerk Meesters [Sat, 12 Jul 2014 03:09:35 +0000 (11:09 +0800)]
Updated NEWS for 34407
Tjerk Meesters [Sat, 12 Jul 2014 03:08:50 +0000 (11:08 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Tjerk Meesters [Sat, 12 Jul 2014 03:07:06 +0000 (11:07 +0800)]
Updated NEWS for 34407
Tjerk Meesters [Wed, 2 Jul 2014 14:22:11 +0000 (22:22 +0800)]
Fix for bug #34407 - ucwords and title case
Added support for ranges like trim() has
George Wang [Fri, 11 Jul 2014 18:39:03 +0000 (14:39 -0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]
Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
Anatol Belski [Fri, 11 Jul 2014 13:06:56 +0000 (15:06 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix makefile in phpize mode
Anatol Belski [Fri, 11 Jul 2014 13:05:01 +0000 (15:05 +0200)]
fix makefile in phpize mode
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
Anatol Belski [Fri, 11 Jul 2014 07:37:19 +0000 (09:37 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixe output_as_table() when no ext was enabled
Anatol Belski [Fri, 11 Jul 2014 07:36:44 +0000 (09:36 +0200)]
fixe output_as_table() when no ext was enabled
Anatol Belski [Thu, 10 Jul 2014 20:34:55 +0000 (22:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix end of stream exception when generating makefile
Anatol Belski [Thu, 10 Jul 2014 20:33:55 +0000 (22:33 +0200)]
fix end of stream exception when generating makefile
Anatol Belski [Thu, 10 Jul 2014 19:51:32 +0000 (21:51 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
force ext_dep.js prepend to configure.js in phpize mode
cleanup file headers.
Do not kill children process in pre-fork mode when parent process quit.
update to LSAPI 6.6
Update LiteSpeed SAPI code to V6.4
Anatol Belski [Thu, 10 Jul 2014 19:50:37 +0000 (21:50 +0200)]
force ext_dep.js prepend to configure.js in phpize mode
George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]
cleanup file headers.
George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]
Do not kill children process in pre-fork mode when parent process quit.
George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]
update to LSAPI 6.6
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Tue, 5 Nov 2013 21:14:49 +0000 (16:14 -0500)]
Update LiteSpeed SAPI code to V6.4
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapidef.h
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]
cleanup file headers.
George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]
Do not kill children process in pre-fork mode when parent process quit.
George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]
update to LSAPI 6.6
Conflicts:
sapi/litespeed/lsapi_main.c
George Wang [Tue, 5 Nov 2013 21:14:49 +0000 (16:14 -0500)]
Update LiteSpeed SAPI code to V6.4
Conflicts:
sapi/litespeed/lsapi_main.c
sapi/litespeed/lsapidef.h
sapi/litespeed/lsapilib.c
sapi/litespeed/lsapilib.h
Anatol Belski [Thu, 10 Jul 2014 17:36:04 +0000 (19:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
turn off PGO in phpize mode
Fixed typo in Makefile.frag
Anatol Belski [Thu, 10 Jul 2014 17:35:26 +0000 (19:35 +0200)]
turn off PGO in phpize mode
George Wang [Tue, 5 Nov 2013 20:38:08 +0000 (15:38 -0500)]
Fixed typo in Makefile.frag
George Wang [Tue, 5 Nov 2013 20:38:08 +0000 (15:38 -0500)]
Fixed typo in Makefile.frag
Stanislav Malyshev [Wed, 9 Jul 2014 04:41:06 +0000 (21:41 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.31
fix unstable test
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 9 Jul 2014 04:26:39 +0000 (21:26 -0700)]
5.4.31
Stanislav Malyshev [Tue, 8 Jul 2014 21:13:46 +0000 (14:13 -0700)]
fix unstable test
Julien Pauli [Tue, 8 Jul 2014 21:54:19 +0000 (23:54 +0200)]
5.5.16 now
Stanislav Malyshev [Tue, 8 Jul 2014 21:13:46 +0000 (14:13 -0700)]
fix unstable test
Stanislav Malyshev [Tue, 8 Jul 2014 19:54:02 +0000 (12:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67587: Redirection loop on nginx with FPM
Christian Weiske [Tue, 8 Jul 2014 16:59:30 +0000 (18:59 +0200)]
Fix bug #67587: Redirection loop on nginx with FPM
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:
set $path_info $fastcgi_path_info;
fastcgi_param PATH_INFO $path_info;
Anatol Belski [Tue, 8 Jul 2014 08:07:31 +0000 (10:07 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
Anatol Belski [Tue, 8 Jul 2014 08:07:18 +0000 (10:07 +0200)]
updated NEWS
Anatol Belski [Tue, 8 Jul 2014 08:06:35 +0000 (10:06 +0200)]
updated NEWS
Anatol Belski [Tue, 8 Jul 2014 07:54:36 +0000 (09:54 +0200)]
Backported the patch from bug #67407 into 5.5+
Anatol Belski [Tue, 8 Jul 2014 07:54:12 +0000 (09:54 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Backported the patch from bug #67407 into 5.4
Anatol Belski [Tue, 8 Jul 2014 07:52:35 +0000 (09:52 +0200)]
Backported the patch from bug #67407 into 5.4
Remi Collet [Tue, 8 Jul 2014 06:31:15 +0000 (08:31 +0200)]
NEWS
Remi Collet [Tue, 8 Jul 2014 06:30:44 +0000 (08:30 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fix Bug #67530 error_log=syslog ignored
Remi Collet [Tue, 8 Jul 2014 06:30:15 +0000 (08:30 +0200)]
NEWS
Remi Collet [Tue, 8 Jul 2014 06:29:24 +0000 (08:29 +0200)]
Fix Bug #67530 error_log=syslog ignored
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
Adam Harvey [Mon, 7 Jul 2014 20:40:47 +0000 (20:40 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
Adam Harvey [Mon, 7 Jul 2014 20:36:06 +0000 (20:36 +0000)]
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
We had an infinite loop in sapi_cli_server_send_headers(): while iterating over
the linked list of headers, when an empty header was hit, continue would go to
the next iteration of the loop without updating h to be the next value in the
linked list. Updating it to always increment regardless of whether the header
is actually valid or not fixes the issue.
Stanislav Malyshev [Mon, 7 Jul 2014 16:35:37 +0000 (09:35 -0700)]
create locales and re-add test
Stanislav Malyshev [Mon, 7 Jul 2014 16:32:26 +0000 (09:32 -0700)]
rm test for now