Ticket #26039: patch-fpm-conf.2.diff

File patch-fpm-conf.2.diff, 1.5 KB (added by chris@…, 14 years ago)

Updated patch-fpm-conf.diff. Original fpm.conf.in has changed.

  • (a) a/sapi/fpm/php-fpm.conf.in.orig vs. (b) b/sapi/fpm/php-fpm.conf.in

    a b  
    2222; Pid file
    2323; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
    2424; Default Value: none
    25 ;pid = run/php-fpm.pid
     25pid = run/php-fpm.pid
    2626
    2727; Error log file
    2828; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
     
    5656
    5757; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging.
    5858; Default Value: yes
    59 ;daemonize = yes
     59daemonize = no
    6060
    6161;;;;;;;;;;;;;;;;;;;;
    6262; Pool Definitions ;
     
    154154; The number of child processes created on startup.
    155155; Note: Used only when pm is set to 'dynamic'
    156156; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
    157 ;pm.start_servers = 20
     157pm.start_servers = 20
    158158
    159159; The desired minimum number of idle server processes.
    160160; Note: Used only when pm is set to 'dynamic'
    161161; Note: Mandatory when pm is set to 'dynamic'
    162 ;pm.min_spare_servers = 5
     162pm.min_spare_servers = 5
    163163
    164164; The desired maximum number of idle server processes.
    165165; Note: Used only when pm is set to 'dynamic'
    166166; Note: Mandatory when pm is set to 'dynamic'
    167 ;pm.max_spare_servers = 35
     167pm.max_spare_servers = 35
    168168 
    169169; The number of requests each child process should execute before respawning.
    170170; This can be useful to work around memory leaks in 3rd party libraries. For