/[smecontribs]/rpms/smeserver-php-scl/contribs9/smeserver-php-scl-0.4-bz10774-default-to-global.patch
ViewVC logotype

Contents of /rpms/smeserver-php-scl/contribs9/smeserver-php-scl-0.4-bz10774-default-to-global.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Sun Jul 21 03:23:49 2019 UTC (5 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-php-scl-0_4-24_el6_sme, smeserver-php-scl-0_4-25_el6_sme, HEAD
Error occurred while calculating annotation data. 
* Sun Jul 21 2019 Jean-Philipe Pialasse <tests@pialasse.com> 0.4-24.sme
- default all php options to main php version values [SME: 10774]
  for all versions.
1 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/20ResourceLimits smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/20ResourceLimits
2 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/20ResourceLimits 2015-02-22 17:17:15.000000000 +0100
3 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/20ResourceLimits 2019-07-21 05:12:22.000000000 +0200
4 @@ -1,14 +1,14 @@
5 max_execution_time = {
6 - my $et = $php54{MaxExecutionTime} || "30";
7 + my $et = $php54{MaxExecutionTime} || $php{MaxExecutionTime} || "30";
8 $OUT .= "$et";
9 }
10 memory_limit = {
11 - my $ml = $php54{MemoryLimit} || "128M";
12 + my $ml = $php54{MemoryLimit} || $php{MemoryLimit} || "128M";
13 $OUT .= "$ml";
14 }
15 ;added by stephdl see $php54{MaxInputTime}
16 max_input_time = {
17 - my $it = $php54{MaxInputTime} || "60";
18 + my $it = $php54{MaxInputTime} || $php{MaxInputTime} || "60";
19 $OUT .= "$it";
20 }
21
22 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/40DataHandling smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/40DataHandling
23 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/40DataHandling 2015-02-22 17:17:15.000000000 +0100
24 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/40DataHandling 2019-07-21 05:12:22.000000000 +0200
25 @@ -3,7 +3,7 @@
26 register_globals = Off
27 register_argc_argv = On
28 post_max_size = {
29 - my $ms = $php54{PostMaxSize} || "20M";
30 + my $ms = $php54{PostMaxSize} || $php{PostMaxSize} || "20M";
31 $OUT .= "$ms";
32 }
33 ;gpc_order = "GPC" #deprecated
34 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/60FileUploads smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/60FileUploads
35 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/60FileUploads 2015-02-22 17:17:15.000000000 +0100
36 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/60FileUploads 2019-07-21 05:12:22.000000000 +0200
37 @@ -1,10 +1,10 @@
38 file_uploads = On
39 upload_max_filesize = {
40 - my $mf = $php54{UploadMaxFilesize} || "10M";
41 + my $mf = $php54{UploadMaxFilesize} || $php{UploadMaxFilesize} || "10M";
42 $OUT .= "$mf";
43 }
44 ; added by stephdl see $php54{MaxFileUpload}
45 max_file_upload = {
46 - my $mfu = $php54{MaxFileUpload} || "20";
47 + my $mfu = $php54{MaxFileUpload} || $php{MaxFileUpload} || "20";
48 $OUT .= "$mfu";
49 }
50 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/65FopenWrappers smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/65FopenWrappers
51 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/65FopenWrappers 2015-02-22 17:17:15.000000000 +0100
52 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php54/root/etc/php.ini/65FopenWrappers 2019-07-21 05:12:22.000000000 +0200
53 @@ -1,4 +1,4 @@
54 -allow_url_fopen = {($php54{AllowUrlFopen} || 'Off')}
55 +allow_url_fopen = {($php54{AllowUrlFopen} || $php{AllowUrlFopen} || 'Off')}
56 ;added by stephdl
57 allow_url_include = Off
58 default_socket_timeout = 60
59 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/20ResourceLimits smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/20ResourceLimits
60 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/20ResourceLimits 2015-02-22 17:17:15.000000000 +0100
61 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/20ResourceLimits 2019-07-21 05:12:22.000000000 +0200
62 @@ -1,14 +1,14 @@
63 max_execution_time = {
64 - my $et = $php55{MaxExecutionTime} || "30";
65 + my $et = $php55{MaxExecutionTime} || $php{MaxExecutionTime} || "30";
66 $OUT .= "$et";
67 }
68 memory_limit = {
69 - my $ml = $php55{MemoryLimit} || "128M";
70 + my $ml = $php55{MemoryLimit} || $php{MemoryLimit} || "128M";
71 $OUT .= "$ml";
72 }
73 ;added by stephdl see $php55{MaxInputTime}
74 max_input_time = {
75 - my $it = $php55{MaxInputTime} || "60";
76 + my $it = $php55{MaxInputTime} || $php{MaxInputTime} || "60";
77 $OUT .= "$it";
78 }
79
80 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/40DataHandling smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/40DataHandling
81 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/40DataHandling 2015-02-22 17:17:15.000000000 +0100
82 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/40DataHandling 2019-07-21 05:12:22.000000000 +0200
83 @@ -3,7 +3,7 @@
84 register_globals = Off
85 register_argc_argv = On
86 post_max_size = {
87 - my $ms = $php55{PostMaxSize} || "20M";
88 + my $ms = $php55{PostMaxSize} || $php{PostMaxSize} || "20M";
89 $OUT .= "$ms";
90 }
91 ;gpc_order = "GPC" #deprecated
92 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/60FileUploads smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/60FileUploads
93 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/60FileUploads 2015-02-22 17:17:15.000000000 +0100
94 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/60FileUploads 2019-07-21 05:12:22.000000000 +0200
95 @@ -1,10 +1,10 @@
96 file_uploads = On
97 upload_max_filesize = {
98 - my $mf = $php55{UploadMaxFilesize} || "10M";
99 + my $mf = $php55{UploadMaxFilesize} || $php{UploadMaxFilesize} || "10M";
100 $OUT .= "$mf";
101 }
102 ; added by stephdl see $php55{MaxFileUpload}
103 max_file_upload = {
104 - my $mfu = $php55{MaxFileUpload} || "20";
105 + my $mfu = $php55{MaxFileUpload} || $php{MaxFileUpload} || "20";
106 $OUT .= "$mfu";
107 }
108 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/65FopenWrappers smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/65FopenWrappers
109 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/65FopenWrappers 2015-02-22 17:17:15.000000000 +0100
110 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php55/root/etc/php.ini/65FopenWrappers 2019-07-21 05:12:22.000000000 +0200
111 @@ -1,4 +1,4 @@
112 -allow_url_fopen = {($php55{AllowUrlFopen} || 'Off')}
113 +allow_url_fopen = {($php55{AllowUrlFopen} || $php{AllowUrlFopen} || 'Off')}
114 ;added by stephdl
115 allow_url_include = Off
116 default_socket_timeout = 60
117 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/20ResourceLimits smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/20ResourceLimits
118 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/20ResourceLimits 2015-02-22 17:17:15.000000000 +0100
119 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/20ResourceLimits 2019-07-21 05:12:22.000000000 +0200
120 @@ -1,14 +1,14 @@
121 max_execution_time = {
122 - my $et = $php56{MaxExecutionTime} || "30";
123 + my $et = $php56{MaxExecutionTime} || $php{MaxExecutionTime} || "30";
124 $OUT .= "$et";
125 }
126 memory_limit = {
127 - my $ml = $php56{MemoryLimit} || "128M";
128 + my $ml = $php56{MemoryLimit} || $php{MemoryLimit} || "128M";
129 $OUT .= "$ml";
130 }
131 ;added by stephdl see $php56{MaxInputTime}
132 max_input_time = {
133 - my $it = $php56{MaxInputTime} || "60";
134 + my $it = $php56{MaxInputTime} || $php{MaxInputTime} || "60";
135 $OUT .= "$it";
136 }
137
138 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/40DataHandling smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/40DataHandling
139 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/40DataHandling 2015-02-22 17:17:15.000000000 +0100
140 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/40DataHandling 2019-07-21 05:12:22.000000000 +0200
141 @@ -3,7 +3,7 @@
142 register_globals = Off
143 register_argc_argv = On
144 post_max_size = {
145 - my $ms = $php56{PostMaxSize} || "20M";
146 + my $ms = $php56{PostMaxSize} || $php{PostMaxSize} || "20M";
147 $OUT .= "$ms";
148 }
149 ;gpc_order = "GPC" #deprecated
150 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/60FileUploads smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/60FileUploads
151 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/60FileUploads 2015-02-22 17:17:15.000000000 +0100
152 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/60FileUploads 2019-07-21 05:12:22.000000000 +0200
153 @@ -1,10 +1,10 @@
154 file_uploads = On
155 upload_max_filesize = {
156 - my $mf = $php56{UploadMaxFilesize} || "10M";
157 + my $mf = $php56{UploadMaxFilesize} || $php{UploadMaxFilesize} || "10M";
158 $OUT .= "$mf";
159 }
160 ; added by stephdl see $php56{MaxFileUpload}
161 max_file_upload = {
162 - my $mfu = $php56{MaxFileUpload} || "20";
163 + my $mfu = $php56{MaxFileUpload} || $php{MaxFileUpload} || "20";
164 $OUT .= "$mfu";
165 }
166 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/65FopenWrappers smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/65FopenWrappers
167 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/65FopenWrappers 2015-02-22 17:17:15.000000000 +0100
168 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php56/root/etc/php.ini/65FopenWrappers 2019-07-21 05:12:22.000000000 +0200
169 @@ -1,4 +1,4 @@
170 -allow_url_fopen = {($php56{AllowUrlFopen} || 'Off')}
171 +allow_url_fopen = {($php56{AllowUrlFopen} || $php{AllowUrlFopen} || 'Off')}
172 ;added by stephdl
173 allow_url_include = Off
174 default_socket_timeout = 60
175 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/20ResourceLimits smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/20ResourceLimits
176 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/20ResourceLimits 2019-07-21 05:04:18.084894618 +0200
177 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/20ResourceLimits 2019-07-21 05:12:22.000000000 +0200
178 @@ -1,14 +1,14 @@
179 max_execution_time = {
180 - my $et = $php70{MaxExecutionTime} || "30";
181 + my $et = $php70{MaxExecutionTime} || $php{MaxExecutionTime} || "30";
182 $OUT .= "$et";
183 }
184 memory_limit = {
185 - my $ml = $php70{MemoryLimit} || "128M";
186 + my $ml = $php70{MemoryLimit} || $php{MemoryLimit} || "128M";
187 $OUT .= "$ml";
188 }
189 ;added by stephdl see $php70{MaxInputTime}
190 max_input_time = {
191 - my $it = $php70{MaxInputTime} || "60";
192 + my $it = $php70{MaxInputTime} || $php{MaxInputTime} || "60";
193 $OUT .= "$it";
194 }
195
196 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/40DataHandling smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/40DataHandling
197 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/40DataHandling 2019-07-21 05:04:18.091894616 +0200
198 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/40DataHandling 2019-07-21 05:12:22.000000000 +0200
199 @@ -3,7 +3,7 @@
200 register_globals = Off
201 register_argc_argv = On
202 post_max_size = {
203 - my $ms = $php70{PostMaxSize} || "20M";
204 + my $ms = $php70{PostMaxSize} || $php{PostMaxSize} || "20M";
205 $OUT .= "$ms";
206 }
207 ;gpc_order = "GPC" #deprecated
208 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/60FileUploads smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/60FileUploads
209 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/60FileUploads 2019-07-21 05:04:18.099894613 +0200
210 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/60FileUploads 2019-07-21 05:12:22.000000000 +0200
211 @@ -1,10 +1,10 @@
212 file_uploads = On
213 upload_max_filesize = {
214 - my $mf = $php70{UploadMaxFilesize} || "10M";
215 + my $mf = $php70{UploadMaxFilesize} || $php{UploadMaxFilesize} || "10M";
216 $OUT .= "$mf";
217 }
218 ; added by stephdl see $php70{MaxFileUpload}
219 max_file_upload = {
220 - my $mfu = $php70{MaxFileUpload} || "20";
221 + my $mfu = $php70{MaxFileUpload} || $php{MaxFileUpload} || "20";
222 $OUT .= "$mfu";
223 }
224 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/65FopenWrappers smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/65FopenWrappers
225 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/65FopenWrappers 2019-07-21 05:04:18.102894610 +0200
226 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php70/root/etc/php.ini/65FopenWrappers 2019-07-21 05:12:22.000000000 +0200
227 @@ -1,4 +1,4 @@
228 -allow_url_fopen = {($php70{AllowUrlFopen} || 'Off')}
229 +allow_url_fopen = {($php70{AllowUrlFopen} || $php{AllowUrlFopen} || 'Off')}
230 ;added by stephdl
231 allow_url_include = Off
232 default_socket_timeout = 60
233 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/20ResourceLimits smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/20ResourceLimits
234 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/20ResourceLimits 2019-07-21 05:04:18.233894563 +0200
235 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/20ResourceLimits 2019-07-21 05:12:22.000000000 +0200
236 @@ -1,14 +1,14 @@
237 max_execution_time = {
238 - my $et = $php71{MaxExecutionTime} || "30";
239 + my $et = $php71{MaxExecutionTime} || $php{MaxExecutionTime} || "30";
240 $OUT .= "$et";
241 }
242 memory_limit = {
243 - my $ml = $php71{MemoryLimit} || "128M";
244 + my $ml = $php71{MemoryLimit} || $php{MemoryLimit} || "128M";
245 $OUT .= "$ml";
246 }
247 ;added by stephdl see $php71{MaxInputTime}
248 max_input_time = {
249 - my $it = $php71{MaxInputTime} || "60";
250 + my $it = $php71{MaxInputTime} || $php{MaxInputTime} || "60";
251 $OUT .= "$it";
252 }
253
254 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/40DataHandling smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/40DataHandling
255 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/40DataHandling 2019-07-21 05:04:18.240894560 +0200
256 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/40DataHandling 2019-07-21 05:12:22.000000000 +0200
257 @@ -3,7 +3,7 @@
258 register_globals = Off
259 register_argc_argv = On
260 post_max_size = {
261 - my $ms = $php71{PostMaxSize} || "20M";
262 + my $ms = $php71{PostMaxSize} || $php{PostMaxSize} || "20M";
263 $OUT .= "$ms";
264 }
265 ;gpc_order = "GPC" #deprecated
266 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/60FileUploads smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/60FileUploads
267 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/60FileUploads 2019-07-21 05:04:18.247894557 +0200
268 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/60FileUploads 2019-07-21 05:12:22.000000000 +0200
269 @@ -1,10 +1,10 @@
270 file_uploads = On
271 upload_max_filesize = {
272 - my $mf = $php71{UploadMaxFilesize} || "10M";
273 + my $mf = $php71{UploadMaxFilesize} || $php{UploadMaxFilesize} || "10M";
274 $OUT .= "$mf";
275 }
276 ; added by stephdl see $php71{MaxFileUpload}
277 max_file_upload = {
278 - my $mfu = $php71{MaxFileUpload} || "20";
279 + my $mfu = $php71{MaxFileUpload} || $php{MaxFileUpload} || "20";
280 $OUT .= "$mfu";
281 }
282 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/65FopenWrappers smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/65FopenWrappers
283 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/65FopenWrappers 2019-07-21 05:04:18.250894557 +0200
284 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php71/root/etc/php.ini/65FopenWrappers 2019-07-21 05:12:22.000000000 +0200
285 @@ -1,4 +1,4 @@
286 -allow_url_fopen = {($php71{AllowUrlFopen} || 'Off')}
287 +allow_url_fopen = {($php71{AllowUrlFopen} || $php{AllowUrlFopen} || 'Off')}
288 ;added by stephdl
289 allow_url_include = Off
290 default_socket_timeout = 60
291 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/20ResourceLimits smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/20ResourceLimits
292 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/20ResourceLimits 2019-07-21 05:04:18.563894443 +0200
293 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/20ResourceLimits 2019-07-21 05:12:22.000000000 +0200
294 @@ -1,14 +1,14 @@
295 max_execution_time = {
296 - my $et = $php72{MaxExecutionTime} || "30";
297 + my $et = $php72{MaxExecutionTime} || $php{MaxExecutionTime} || "30";
298 $OUT .= "$et";
299 }
300 memory_limit = {
301 - my $ml = $php72{MemoryLimit} || "128M";
302 + my $ml = $php72{MemoryLimit} || $php{MemoryLimit} || "128M";
303 $OUT .= "$ml";
304 }
305 ;added by stephdl see $php72{MaxInputTime}
306 max_input_time = {
307 - my $it = $php72{MaxInputTime} || "60";
308 + my $it = $php72{MaxInputTime} || $php{MaxInputTime} || "60";
309 $OUT .= "$it";
310 }
311
312 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/40DataHandling smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/40DataHandling
313 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/40DataHandling 2019-07-21 05:04:18.570894440 +0200
314 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/40DataHandling 2019-07-21 05:12:22.000000000 +0200
315 @@ -3,7 +3,7 @@
316 register_globals = Off
317 register_argc_argv = On
318 post_max_size = {
319 - my $ms = $php72{PostMaxSize} || "20M";
320 + my $ms = $php72{PostMaxSize} || $php{PostMaxSize} || "20M";
321 $OUT .= "$ms";
322 }
323 ;gpc_order = "GPC" #deprecated
324 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/60FileUploads smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/60FileUploads
325 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/60FileUploads 2019-07-21 05:04:18.577894437 +0200
326 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/60FileUploads 2019-07-21 05:12:22.000000000 +0200
327 @@ -1,10 +1,10 @@
328 file_uploads = On
329 upload_max_filesize = {
330 - my $mf = $php72{UploadMaxFilesize} || "10M";
331 + my $mf = $php72{UploadMaxFilesize} || $php{UploadMaxFilesize} || "10M";
332 $OUT .= "$mf";
333 }
334 ; added by stephdl see $php72{MaxFileUpload}
335 max_file_upload = {
336 - my $mfu = $php72{MaxFileUpload} || "20";
337 + my $mfu = $php72{MaxFileUpload} || $php{MaxFileUpload} || "20";
338 $OUT .= "$mfu";
339 }
340 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/65FopenWrappers smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/65FopenWrappers
341 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/65FopenWrappers 2019-07-21 05:04:18.580894437 +0200
342 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php72/root/etc/php.ini/65FopenWrappers 2019-07-21 05:12:22.000000000 +0200
343 @@ -1,4 +1,4 @@
344 -allow_url_fopen = {($php72{AllowUrlFopen} || 'Off')}
345 +allow_url_fopen = {($php72{AllowUrlFopen} || $php{AllowUrlFopen} || 'Off')}
346 ;added by stephdl
347 allow_url_include = Off
348 default_socket_timeout = 60
349 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/20ResourceLimits smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/20ResourceLimits
350 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/20ResourceLimits 2019-07-21 05:04:18.782894362 +0200
351 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/20ResourceLimits 2019-07-21 05:12:22.000000000 +0200
352 @@ -1,14 +1,14 @@
353 max_execution_time = {
354 - my $et = $php73{MaxExecutionTime} || "30";
355 + my $et = $php73{MaxExecutionTime} || $php{MaxExecutionTime} || "30";
356 $OUT .= "$et";
357 }
358 memory_limit = {
359 - my $ml = $php73{MemoryLimit} || "128M";
360 + my $ml = $php73{MemoryLimit} || $php{MemoryLimit} || "128M";
361 $OUT .= "$ml";
362 }
363 ;added by stephdl see $php73{MaxInputTime}
364 max_input_time = {
365 - my $it = $php73{MaxInputTime} || "60";
366 + my $it = $php73{MaxInputTime} || $php{MaxInputTime} || "60";
367 $OUT .= "$it";
368 }
369
370 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/40DataHandling smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/40DataHandling
371 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/40DataHandling 2019-07-21 05:04:18.789894360 +0200
372 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/40DataHandling 2019-07-21 05:12:22.000000000 +0200
373 @@ -3,7 +3,7 @@
374 register_globals = Off
375 register_argc_argv = On
376 post_max_size = {
377 - my $ms = $php73{PostMaxSize} || "20M";
378 + my $ms = $php73{PostMaxSize} || $php{PostMaxSize} || "20M";
379 $OUT .= "$ms";
380 }
381 ;gpc_order = "GPC" #deprecated
382 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/60FileUploads smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/60FileUploads
383 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/60FileUploads 2019-07-21 05:04:18.797894357 +0200
384 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/60FileUploads 2019-07-21 05:12:22.000000000 +0200
385 @@ -1,10 +1,10 @@
386 file_uploads = On
387 upload_max_filesize = {
388 - my $mf = $php73{UploadMaxFilesize} || "10M";
389 + my $mf = $php73{UploadMaxFilesize} || $php{UploadMaxFilesize} || "10M";
390 $OUT .= "$mf";
391 }
392 ; added by stephdl see $php73{MaxFileUpload}
393 max_file_upload = {
394 - my $mfu = $php73{MaxFileUpload} || "20";
395 + my $mfu = $php73{MaxFileUpload} || $php{MaxFileUpload} || "20";
396 $OUT .= "$mfu";
397 }
398 diff -Nur smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/65FopenWrappers smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/65FopenWrappers
399 --- smeserver-php-scl-0.4.old/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/65FopenWrappers 2019-07-21 05:04:18.800894355 +0200
400 +++ smeserver-php-scl-0.4/root/etc/e-smith/templates/opt/remi/php73/root/etc/php.ini/65FopenWrappers 2019-07-21 05:12:22.000000000 +0200
401 @@ -1,4 +1,4 @@
402 -allow_url_fopen = {($php73{AllowUrlFopen} || 'Off')}
403 +allow_url_fopen = {($php73{AllowUrlFopen} || $php{AllowUrlFopen} || 'Off')}
404 ;added by stephdl
405 allow_url_include = Off
406 default_socket_timeout = 60
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed