/[smecontribs]/rpms/smeserver-mod_dav/contribs10/smeserver-mod_dav-1.1-bz12051-24syntax.patch
ViewVC logotype

Diff of /rpms/smeserver-mod_dav/contribs10/smeserver-mod_dav-1.1-bz12051-24syntax.patch

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

Revision 1.1 by jpp, Fri Jul 29 04:17:39 2022 UTC Revision 1.2 by jpp, Fri Jul 29 04:55:57 2022 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-mod_dav-1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays smeserver-mod_dav-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays  diff -Nur --no-dereference smeserver-mod_dav-1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays smeserver-mod_dav-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays
2  --- smeserver-mod_dav-1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays   2022-07-28 23:51:31.454000000 -0400  --- smeserver-mod_dav-1.1.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays   2022-07-28 23:51:31.454000000 -0400
3  +++ smeserver-mod_dav-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays       2022-07-29 00:15:04.844000000 -0400  +++ smeserver-mod_dav-1.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95Addmod_dav2ibays       2022-07-29 00:52:11.073000000 -0400
4  @@ -13,7 +13,7 @@  @@ -13,7 +13,7 @@
5          $OUT .= "\n    # ibay $key disabled for httpd so no DAV access\n" if $access eq 'none';          $OUT .= "\n    # ibay $key disabled for httpd so no DAV access\n" if $access eq 'none';
6          next if $access eq 'none';          next if $access eq 'none';
# Line 10  diff -Nur --no-dereference smeserver-mod Line 10  diff -Nur --no-dereference smeserver-mod
10           if ($properties{'ModDav'})           if ($properties{'ModDav'})
11           {           {
12               if ($properties{'ModDav'} eq 'enabled')               if ($properties{'ModDav'} eq 'enabled')
13  @@ -35,7 +35,7 @@  @@ -32,10 +32,10 @@
14                    $OUT .= "    <FilesMatch \\.php\$>\n";                                  if ($dynamicContent eq 'enabled' && $secureEXEC eq 'enabled')
15                    {
16                      # we do not want PHP or CGI to be runt there for security reason
17    -                 $OUT .= "    <FilesMatch \\.php\$>\n";                
18    +                 $OUT .= "    <FilesMatch \\.(phar|php)\$>\n";                
19                    $OUT .= "        #disabling php\n";                    $OUT .= "        #disabling php\n";
20                     $OUT .= "        SetHandler !\n"; # could use also SetHandler  none                     $OUT .= "        SetHandler !\n"; # could use also SetHandler  none
21  -                 $OUT .= "        deny from all\n" if ( $properties{'ModDavHidePHP'} || 'enabled' ) eq 'enabled';  -                 $OUT .= "        deny from all\n" if ( $properties{'ModDavHidePHP'} || 'enabled' ) eq 'enabled';
# Line 52  diff -Nur --no-dereference smeserver-mod Line 56  diff -Nur --no-dereference smeserver-mod
56  -                $OUT .= "      " . $WriteRequire . "\n";  -                $OUT .= "      " . $WriteRequire . "\n";
57  -               $OUT .= "      Satisfy All\n";  -               $OUT .= "      Satisfy All\n";
58  -                $OUT .= "      ". $WriteAllow ."\n";  -                $OUT .= "      ". $WriteAllow ."\n";
59  +                $OUT .= "      <RequireAll>n";  +                $OUT .= "      <RequireAll>\n";
60  +                $OUT .= "        " . $WriteRequire . "\n";  +                $OUT .= "        " . $WriteRequire . "\n";
61  +                $OUT .= "        ". $WriteAllow ."\n";  +                $OUT .= "        ". $WriteAllow ."\n";
62  +               $OUT .= "      </RequireAll>n";  +               $OUT .= "      </RequireAll>\n";
63                   $OUT .= "    </LimitExcept>\n\n";                   $OUT .= "    </LimitExcept>\n\n";
64                   $OUT .= "</Directory>\n";                   $OUT .= "</Directory>\n";
65               }               }

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