/[smecontribs]/rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz12056-httpd24.patch
ViewVC logotype

Diff of /rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin-4.0.10.2-bz12056-httpd24.patch

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

Revision 1.2 by jpp, Sun Jul 24 04:20:03 2022 UTC Revision 1.3 by jpp, Mon Aug 1 03:25:02 2022 UTC
# Line 115  diff -Nur --no-dereference smeserver-php Line 115  diff -Nur --no-dereference smeserver-php
115   </Directory>);   </Directory>);
116    
117     }     }
118    diff -Nur --no-dereference smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias
119    --- smeserver-phpmyadmin-4.0.10.2.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias    2022-07-31 23:18:04.267000000 -0400
120    +++ smeserver-phpmyadmin-4.0.10.2/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86PhpmyadminAlias        2022-07-31 23:22:01.899000000 -0400
121    @@ -44,21 +44,11 @@
122         SSLRequireSSL
123         Options -Indexes
124         AllowOverride None
125    -    <IfModule mod_access_compat.c>
126    -      order deny,allow
127    -      deny from all
128    -    );
129    -    $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ?  "  allow from all": "  allow from $localAccess $externalSSLAccess";
130    -    $OUT .= qq(
131    -      Satisfy all
132    -    </IfModule>
133    -    <IfModule !mod_access_compat.c>
134    -      <RequireAll>
135    +    <RequireAll>
136         );
137         $OUT .= (($phpmyadmin{access} || 'private' ) eq "public" ) ?  "      Require all granted": "      Require ip $localAccess $externalSSLAccess";
138         $OUT .= qq(
139    -      </RequireAll>
140    -    </IfModule>
141    +    </RequireAll>
142         );
143    
144       # we do not want people to mess with this for the moment
145    @@ -77,48 +67,20 @@
146     # phpMyAdmin upstream tarball
147     #
148     <Directory /usr/share/phpMyAdmin/setup/>
149    -    <IfModule mod_access_compat.c>
150    -      Order Deny,Allow
151    -      Deny from All
152    -      Allow from None
153    -    </IfModule>
154    -    <IfModule !mod_access_compat.c>
155    -      Require all denied
156    -    </IfModule>
157    +    Require all denied
158     </Directory>
159    
160    
161     <Directory /usr/share/phpMyAdmin/libraries/>
162    -    <IfModule mod_access_compat.c>
163    -      Order Deny,Allow
164    -      Deny from All
165    -      Allow from None
166    -    </IfModule>
167    -    <IfModule !mod_access_compat.c>
168    -      Require all denied
169    -    </IfModule>
170    +    Require all denied
171     </Directory>
172    
173     <Directory /usr/share/phpMyAdmin/setup/lib/>
174    -    <IfModule mod_access_compat.c>
175    -      Order Deny,Allow
176    -      Deny from All
177    -      Allow from None
178    -    </IfModule>
179    -    <IfModule !mod_access_compat.c>
180    -      Require all denied
181    -    </IfModule>
182    +    Require all denied
183     </Directory>
184    
185     <Directory /usr/share/phpMyAdmin/setup/frames/>
186    -    <IfModule mod_access_compat.c>
187    -      Order Deny,Allow
188    -      Deny from All
189    -      Allow from None
190    -    </IfModule>
191    -    <IfModule !mod_access_compat.c>
192    -      Require all denied
193    -    </IfModule>
194    +    Require all denied
195     </Directory>);
196    
197       }

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed