mirror of
git://slackware.nl/current.git
synced 2024-12-29 10:25:00 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
28 lines
973 B
Diff
28 lines
973 B
Diff
--- ./sapi/fpm/php-fpm.conf.in.orig 2012-05-20 19:47:53.000000000 +0200
|
|
+++ ./sapi/fpm/php-fpm.conf.in 2012-05-21 09:16:32.646276661 +0200
|
|
@@ -12,7 +12,7 @@
|
|
; Relative path can also be used. They will be prefixed by:
|
|
; - the global prefix if it's been set (-p arguement)
|
|
; - @prefix@ otherwise
|
|
-;include=etc/fpm.d/*.conf
|
|
+;include=etc/php-fpm.d/*.conf
|
|
|
|
;;;;;;;;;;;;;;;;;;
|
|
; Global Options ;
|
|
@@ -22,14 +22,14 @@
|
|
; Pid file
|
|
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
|
|
; Default Value: none
|
|
-;pid = run/php-fpm.pid
|
|
+pid = run/php-fpm.pid
|
|
|
|
; Error log file
|
|
; If it's set to "syslog", log is sent to syslogd instead of being written
|
|
; in a local file.
|
|
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
|
|
; Default Value: log/php-fpm.log
|
|
-;error_log = log/php-fpm.log
|
|
+error_log = log/php-fpm.log
|
|
|
|
; syslog_facility is used to specify what type of program is logging the
|
|
; message. This lets syslogd specify that messages from different facilities
|