← Back to branch summary

~ubuntu-branches/ubuntu/lucid/suphp/lucid

« back to all changes in this revision

Viewing changes to debian/patches/01_debian.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Emmanuel Lacour
  • Date: 2009-08-03 15:15:38 UTC
  • mfrom: (8.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090803151538-pv7yhe6w1mqmceas
Tags: 0.7.1-1
http://bugs.debian.org/528379
http://bugs.debian.org/520182
http://bugs.debian.org/517805
http://bugs.debian.org/519005
http://bugs.debian.org/514725
* New upstream release (closes: #528379, #520182) 
* debian/NEWS: add information about AddHandler -> AddType change introduced
  in 0.6.2-2 (closes: #517805)
* debian/conf/suphp.conf, debian/patches/01_debian.dpatch: switch from
  application/x-httpd-php to application/x-httpd-suphp to allow
  simultaneous use of mod_suphp and mod_php (closes: #519005, #514725)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_debian.dpatch
7
7
@DPATCH@
8
8
--- ./doc/suphp.conf-example
9
9
+++ ./doc/suphp.conf-example
10
 
@@ -1,15 +1,15 @@
 
10
@@ -1,12 +1,12 @@
11
11
 [global]
12
12
 ;Path to logfile
13
13
-logfile=/var/log/suphp.log
21
21
+webserver_user=www-data
22
22
 
23
23
 ;Path all scripts have to be in
24
 
-docroot=/
25
 
+docroot=/var/www
26
 
 
27
 
 ;Path to chroot() to before executing script
28
 
 ;chroot=/mychroot
29
 
@@ -41,7 +41,7 @@
 
24
 docroot=/var/www:${HOME}/public_html
 
25
@@ -41,7 +41,7 @@ min_gid=100
30
26
 
31
27
 [handlers]
32
28
 ;Handler for php-scripts
33
 
-x-httpd-php=php:/usr/bin/php
34
 
+application/x-httpd-php=php:/usr/bin/php-cgi
 
29
-x-httpd-php="php:/usr/bin/php"
 
30
+application/x-httpd-suphp="php:/usr/bin/php-cgi"
35
31
 
36
32
 ;Handler for CGI-scripts
37
 
 x-suphp-cgi=execute:!self
 
33
 x-suphp-cgi="execute:!self"