delta/php-git.git/sapi, branch php-5.5.17 git.php.net: repository/php-src.git Merge branch 'PHP-5.4' into PHP-5.5 2014-08-29T06:11:55+00:00 Stanislav Malyshev stas@php.net 2014-08-29T06:11:08+00:00 e55c641792df2caf813b5df3272144974e4d8fc7 * PHP-5.4: fix NEWS for fcgi fix merge restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 
* PHP-5.4:
  fix NEWS for fcgi fix merge
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 2014-08-29T06:06:00+00:00 David Zuelke dzuelke@gmail.com 2014-08-09T06:26:33+00:00 ee275e34c8b303945945c650d4bc90dcc2ac0b17 






Fix bug #67878 program_prefix not honoured in man pages
2014-08-21T07:14:16+00:00

Remi Collet
remi@php.net

2014-08-21T07:09:21+00:00

e9166fec62bb499059c039b95b1de7ff8443baf9

- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment





- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment







Merge branch 'PHP-5.4' into PHP-5.5
2014-07-30T18:12:50+00:00

Michael Wallner
mike@php.net

2014-07-30T18:12:50+00:00

6ed9991a6f327242a1214a485775a106f5eb015e

* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).





* PHP-5.4:
  Fixed bug #67715 (php-milter does not build and crashes randomly).







Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30T18:12:13+00:00

Michael Wallner
mike@php.net

2014-07-30T18:12:13+00:00

12b2127b72543710590887d8bcf26be9e02bcc71












See bug #67635
2014-07-20T09:14:43+00:00

Remi Collet
remi@php.net

2014-07-20T09:14:43+00:00

658f7d77f9eb447ecc2f9812d46b4c07bb99b16d

Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments





Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments







improve previous, add message during configure
2014-07-19T16:42:40+00:00

Remi Collet
remi@php.net

2014-07-19T16:42:40+00:00

144a08395408506fa700c71e74c360160da3bd99












Fixed bug #67635 php links to systemd libraries without using pkg-config
2014-07-19T16:40:20+00:00

Remi Collet
remi@php.net

2014-07-19T16:40:20+00:00

7b6031567251ad47132de23f47eb57951fd9b563

Patch from pacho at gentoo dot org

Rely on pkg-config for systemd >= 209
Failback on old check





Patch from pacho at gentoo dot org

Rely on pkg-config for systemd >= 209
Failback on old check







This test depends on expose_php being on
2014-07-14T15:22:05+00:00

Rasmus Lerdorf
rasmus@php.net

2014-07-14T15:21:27+00:00

3b08082600ed8e136ac43d7f08b03d6d574dadda












Fix #67594 - invisible colon should be stripped off header name
2014-07-12T04:45:50+00:00

Tjerk Meesters
datibbaw@php.net

2014-07-12T04:45:50+00:00

1684ba3c6f2f0aa8700363acbca98acf9f3afc45