From: Dragan Dosen <ddosen@ffzg.hr>
Date: Wed, 6 Feb 2008 15:16:44 +0000 (+0000)
Subject: r13:
X-Git-Tag: v5.3.3+3~17
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=e5918b19b1cb2efa40d801c6643ea44dc0eefc4d;p=php5-cn.git

r13:
  * cp_check_and_sed - kod php.ini provjere, matchira da je "M$"
    kraj jedne linije, no mozda korisnik ima iza "M" neki svoj
    komentar.
---

diff --git a/debian/postinst b/debian/postinst
index 50c3ec7..f15b8a6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -128,15 +128,15 @@ for SAPI in apache apache2 cgi cli; do
 	
         if [ -f "$ini_file" ]; then
 
-		cp_check_and_sed "^[[:space:]]*upload_max_filesize[[:space:]]*=[[:space:]]*2M$" \
+		cp_check_and_sed "^[[:space:]]*upload_max_filesize[[:space:]]*=[[:space:]]*2M" \
 			's/^[[:space:]]*upload_max_filesize[[:space:]]*=.*/upload_max_filesize = 256M/' \
 			"$ini_file" && need_restart=1 || true
 
-		cp_check_and_sed "^[[:space:]]*post_max_size[[:space:]]*=[[:space:]]*8M$" \
+		cp_check_and_sed "^[[:space:]]*post_max_size[[:space:]]*=[[:space:]]*8M" \
 			's/^[[:space:]]*post_max_size[[:space:]]*=.*/post_max_size = 256M/' \
 			"$ini_file" && need_restart=1 || true
 
-		cp_check_and_sed "^[[:space:]]*memory_limit[[:space:]]*=[[:space:]]*16M$" \
+		cp_check_and_sed "^[[:space:]]*memory_limit[[:space:]]*=[[:space:]]*16M" \
 			's/^[[:space:]]*memory_limit[[:space:]]*=.*/memory_limit = 256M/' \
 			"$ini_file" && need_restart=1 || true
         fi