/[smeserver]/rpms/e-smith-php/sme10/e-smith-php-2.6.0_add_upload_tmp_folder.patch
ViewVC logotype

Diff of /rpms/e-smith-php/sme10/e-smith-php-2.6.0_add_upload_tmp_folder.patch

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

Revision 1.2 by unnilennium, Thu Jun 23 14:56:11 2016 UTC Revision 1.3 by unnilennium, Sun Jun 26 17:20:56 2016 UTC
# Line 1  Line 1 
1  diff -Nur e-smith-php-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays e-smith-php-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays  diff -Nur e-smith-php-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays e-smith-php-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays
2  --- e-smith-php-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays     2014-03-22 18:09:55.349034164 +0100  --- e-smith-php-2.6.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays     2006-03-16 19:07:08.000000000 -0500
3  +++ e-smith-php-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2014-03-22 23:09:00.603783904 +0100  +++ e-smith-php-2.6.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/95AddType00PHP2ibays 2016-06-26 12:48:14.386000000 -0400
4  @@ -17,6 +17,11 @@  @@ -13,9 +13,15 @@
5                    $OUT .= "    AddType application/x-httpd-php .php .php3 .phtml\n";
6                    $OUT .= "    AddType application/x-httpd-php-source .phps\n";
7    
8    +                # Set the upload_tmp_folder where php can upload files
9    +                my $tmpdir = $ibay->prop('PHPTmpDir') || 'enabled';
10    +                $tmpdir = ('/var/cache/e-smith/files/ibays/' . $ibay->key . '/tmp') if $tmpdir eq 'enabled';
11    +                $OUT .= "    php_admin_value upload_tmp_dir $tmpdir\n" unless ($tmpdir eq 'disabled' || ! -d $tmpdir);
12    +
13                    # Set the sandbox within which PHP is confined to play
14                  my $basedir = $ibay->prop('PHPBaseDir')                  my $basedir = $ibay->prop('PHPBaseDir')
15                      || ("/home/e-smith/files/ibays/" . $ibay->key . "/");                      || ("/home/e-smith/files/ibays/" . $ibay->key . "/");
16    +               $basedir = $tmpdir . ":" . $basedir unless ($tmpdir eq 'disabled' || ! -d $tmpdir);
17                  $OUT .= "    php_admin_value open_basedir $basedir\n";                  $OUT .= "    php_admin_value open_basedir $basedir\n";
 +  
 +               # Set the upload_tmp_folder where php can upload files  
 +               my $tmpdir = $ibay->prop('PHPTmpDir') || 'enabled';  
 +               $tmpdir = ('/home/e-smith/files/ibays/' . $ibay->key . '/tmp') if $tmpdir eq 'enabled';  
 +               $OUT .= "    php_admin_value upload_tmp_dir $tmpdir\n" unless ($tmpdir eq 'disabled' || ! -d $tmpdir);  
18                  $OUT .= "</Directory>\n";                  $OUT .= "</Directory>\n";
19              }              }
         }  

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