richard: server/kolabd/kolabd/templates httpd.conf.template.in, 1.2, 1.3 php.ini.template.in, 1.2, 1.3
cvs at intevation.de
cvs at intevation.de
Thu Dec 22 23:33:10 CET 2005
Author: richard
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv19820/templates
Modified Files:
httpd.conf.template.in php.ini.template.in
Log Message:
* dist_conf/kolab: changed phppeardir from ${phplibdir}/pear to
${phplibdir2}/pear
* templates/httpd.conf.template.in,
templates/php.ini.template.in: changed @phplibdir2@/pear to
@phppeardir@
Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- httpd.conf.template.in 5 Dec 2005 16:21:34 -0000 1.2
+++ httpd.conf.template.in 22 Dec 2005 22:33:08 -0000 1.3
@@ -233,7 +233,7 @@
@@@endif@@@
DavMinTimeout 600
AddDefaultCharset Off
- php_value include_path ".:@phplibdir2@:@phplibdir2@/pear:/php/include:@phplibdir@"
+ php_value include_path ".:@phplibdir2@:@phppeardir@:/php/include:@phplibdir@"
#php_admin_flag safe_mode on
</Directory>
@@ -266,7 +266,7 @@
<Directory "@webserver_document_root@/fbview">
AllowOverride All
Allow from all
- php_value include_path ".:@phplibdir2@:@phplibdir2@/pear:/php/include:@phplibdir@"
+ php_value include_path ".:@phplibdir2@:@phppeardir@:/php/include:@phplibdir@"
</Directory>
<Directory "@webserver_document_root@/admin">
Index: php.ini.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/php.ini.template.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- php.ini.template.in 5 Dec 2005 16:21:34 -0000 1.2
+++ php.ini.template.in 22 Dec 2005 22:33:08 -0000 1.3
@@ -370,7 +370,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-include_path = ".:/php/include:@phplibdir@:@phplibdir2@:@phplibdir2@/pear"
+include_path = ".:/php/include:@phplibdir@:@phplibdir2@:@phppeardir@"
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
More information about the commits
mailing list