/[smeserver]/rpms/e-smith-php/sme8/e-smith-php-1.12.0-fixSpacing.patch
ViewVC logotype

Annotation of /rpms/e-smith-php/sme8/e-smith-php-1.12.0-fixSpacing.patch

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


Revision 1.3 - (hide annotations) (download)
Wed Aug 20 19:07:45 2008 UTC (16 years, 3 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-php-1_12_0-8_el5_sme
Changes since 1.2: +1 -1 lines
* Wed Aug 20 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.12.0-8
- Fix latest patches to prevent .orig file [SME: 4513]

1 snetram 1.1 --- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/20ResourceLimits.fixSpacing 2006-03-17 01:07:08.000000000 +0100
2     +++ e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/20ResourceLimits 2008-08-19 22:59:16.000000000 +0200
3     @@ -1,8 +1,8 @@
4     -max_execution_time = {
5     +max_execution_time = {
6     my $et = $php{MaxExecutionTime} || "30";
7     $OUT .= "$et";
8     }
9     -memory_limit = {
10     +memory_limit = {
11     my $ml = $php{MemoryLimit} || "32M";
12     $OUT .= "$ml";
13     }
14     --- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/60FileUploads.fixSpacing 2006-03-17 01:07:08.000000000 +0100
15     +++ e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/60FileUploads 2008-08-19 23:04:17.000000000 +0200
16     @@ -1,5 +1,5 @@
17     -file_uploads = On
18     -upload_max_filesize = {
19     +file_uploads = On
20     +upload_max_filesize = {
21     my $mf = $php{UploadMaxFilesize} || "10M";
22     $OUT .= "$mf";
23     }
24     --- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/10LanguageOptions.fixSpacing 2002-03-15 18:55:51.000000000 +0100
25     +++ e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/10LanguageOptions 2008-08-19 22:57:24.000000000 +0200
26     @@ -1,24 +1,24 @@
27     {#;;;;;;;;;;;;;;;;;;
28     # Language Options ;
29     #;;;;;;;;;;;;;;;;;;;}
30     -engine = On
31     -short_open_tag = On ;
32     -asp_tags = Off
33     -precision = 14
34     -y2k_compliance = Off
35     -output_buffering = Off
36     -output_handler =
37     -implicit_flush = Off
38     -allow_call_time_pass_reference = On
39     -safe_mode = Off
40     -safe_mode_exec_dir =
41     -safe_mode_allowed_env_vars = PHP_
42     -safe_mode_protected_env_vars = LD_LIBRARY_PATH
43     -disable_functions =
44     -highlight.string = #DD0000
45     -highlight.comment = #FF8000
46     -highlight.keyword = #007700
47     -highlight.bg = #FFFFFF
48     -highlight.default = #0000BB
49     -highlight.html = #000000
50     -expose_php = On
51     +engine = On
52     +short_open_tag = On;
53     +asp_tags = Off
54     +precision = 14
55     +y2k_compliance = Off
56     +output_buffering = Off
57     +output_handler =
58     +implicit_flush = Off
59     +allow_call_time_pass_reference = On
60     +safe_mode = Off
61     +safe_mode_exec_dir =
62     +safe_mode_allowed_env_vars = PHP_
63     +safe_mode_protected_env_vars = LD_LIBRARY_PATH
64     +disable_functions =
65     +highlight.string = #DD0000
66     +highlight.comment = #FF8000
67     +highlight.keyword = #007700
68     +highlight.bg = #FFFFFF
69     +highlight.default = #0000BB
70     +highlight.html = #000000
71     +expose_php = On
72     --- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/40DataHandling.fixSpacing 2006-03-17 01:07:08.000000000 +0100
73     +++ e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/40DataHandling 2008-08-19 23:01:57.000000000 +0200
74     @@ -1,15 +1,16 @@
75     -variables_order = "EGPCS"
76     -register_globals = Off
77     -register_argc_argv = On
78     -post_max_size ={
79     +mysql.allow_persistent = On
80     +variables_order = "EGPCS"
81     +register_globals = Off
82     +register_argc_argv = On
83 snetram 1.2 +post_max_size = {
84 snetram 1.1 my $ms = $php{PostMaxSize} || "20M";
85     $OUT .= "$ms";
86     }
87     -gpc_order = "GPC"
88     -magic_quotes_gpc = On
89     -magic_quotes_runtime= Off
90     -magic_quotes_sybase = Off
91     -auto_prepend_file =
92     -auto_append_file =
93     -default_mimetype = "text/html"
94     +gpc_order = "GPC"
95     +magic_quotes_gpc = On
96     +magic_quotes_runtime = Off
97     +magic_quotes_sybase = Off
98     +auto_prepend_file =
99     +auto_append_file =
100     +default_mimetype = "text/html"
101    
102     --- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories.fixSpacing 2008-08-19 22:53:21.000000000 +0200
103     +++ e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/50PathsDirectories 2008-08-19 23:03:34.000000000 +0200
104     @@ -1,8 +1,9 @@
105     -include_path = ".:/usr/share/pear-addons:/usr/share/pear"
106     -doc_root =
107     -user_dir =
108     -extension_dir = { return "/usr/lib64/php/modules" if -d "/usr/lib64/php/modules";
109     - return "/usr/lib/php/modules" if -d "/usr/lib/php/modules";
110     - return "/usr/lib64/php4" if -d "/usr/lib64/php4";
111     - return "/usr/lib/php4"; }
112     -enable_dl = On
113     +mysql.allow_persistent = On
114     +include_path = ".:/usr/share/pear-addons:/usr/share/pear"
115     +doc_root =
116     +user_dir =
117     +extension_dir = { return "/usr/lib64/php/modules" if -d "/usr/lib64/php/modules";
118     + return "/usr/lib/php/modules" if -d "/usr/lib/php/modules";
119     + return "/usr/lib64/php4" if -d "/usr/lib64/php4";
120     + return "/usr/lib/php4"; }
121     +enable_dl = On
122     --- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/30ErrorHandling.fixSpacing 2002-03-15 19:05:53.000000000 +0100
123     +++ e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/30ErrorHandling 2008-08-19 23:00:28.000000000 +0200
124     @@ -1,7 +1,8 @@
125     -error_reporting = E_ALL & ~E_NOTICE
126     -display_errors = Off
127     -display_startup_errors = Off
128     -log_errors = On
129     -error_log = syslog
130     -track_errors = Off
131     -warn_plus_overloading = Off
132     +mysql.allow_persistent = On
133     +error_reporting = E_ALL & ~E_NOTICE
134     +display_errors = Off
135     +display_startup_errors = Off
136     +log_errors = On
137     +error_log = syslog
138     +track_errors = Off
139     +warn_plus_overloading = Off
140     --- e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings08MySQL.fixSpacing 2008-08-19 22:53:21.000000000 +0200
141     +++ e-smith-php-1.12.0/root/etc/e-smith/templates/etc/php.ini/80ModuleSettings08MySQL 2008-08-19 22:54:19.000000000 +0200
142     @@ -6,5 +6,5 @@
143     mysql.default_socket =
144 snetram 1.3 mysql.default_host =
145 snetram 1.1 mysql.default_user =
146     -mysql.default_password =
147 snetram 1.2 +mysql.default_password =
148 snetram 1.1

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed