/[smecontribs]/rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.5.0-bz11611.patch
ViewVC logotype

Diff of /rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin-1.5.0-bz11611.patch

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

Revision 1.5 by jpp, Tue Jun 1 17:15:32 2021 UTC Revision 1.6 by jpp, Tue Jun 1 17:29:33 2021 UTC
# Line 12  diff -Nur --no-dereference smeserver-php Line 12  diff -Nur --no-dereference smeserver-php
12  +         {  +         {
13  +             templates2events("/etc/httpd/conf/httpd.conf", $event);  +             templates2events("/etc/httpd/conf/httpd.conf", $event);
14  +             templates2events("/etc/phpldapadmin/config.php", $event);  +             templates2events("/etc/phpldapadmin/config.php", $event);
15  +             templates2events("/etc/opt/remi/php74/php-fpm.d/www.conf", $event);  +             templates2events("/etc/opt/remi/php____PHPVERSION____/php-fpm.d/www.conf", $event);
16  +             safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");  +             safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
17  +             safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php74-php-fpm");  +             safe_symlink("reload-or-restart", "root/etc/e-smith/events/$event/services2adjust/php____PHPVERSION____-php-fpm");
18  +         }  +         }
19  diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status smeserver-phpldapadmin-1.5.0/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status  diff -Nur --no-dereference smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status smeserver-phpldapadmin-1.5.0/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status
20  --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status     1969-12-31 19:00:00.000000000 -0500  --- smeserver-phpldapadmin-1.5.0.old/root/etc/e-smith/db/configuration/defaults/phpldapadmin/status     1969-12-31 19:00:00.000000000 -0500
# Line 32  diff -Nur --no-dereference smeserver-php Line 32  diff -Nur --no-dereference smeserver-php
32  -    php_flag  magic_quotes_gpc  on  -    php_flag  magic_quotes_gpc  on
33  -    php_flag  track_vars        on  -    php_flag  track_vars        on
34  +    <FilesMatch \.php$>  +    <FilesMatch \.php$>
35  +        SetHandler "proxy:unix:/var/run/php-fpm/php74-phpldapadmin.sock|fcgi://localhost"  +        SetHandler "proxy:unix:/var/run/php-fpm/php____PHPVERSION____-phpldapadmin.sock|fcgi://localhost"
36  +    </FilesMatch>  +    </FilesMatch>
37  +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1  +    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1
38  +  +
# Line 44  diff -Nur --no-dereference smeserver-php Line 44  diff -Nur --no-dereference smeserver-php
44  @@ -0,0 +1,73 @@  @@ -0,0 +1,73 @@
45  +{  +{
46  +  +
47  +if ($PHP_VERSION eq '74'){  +if ($PHP_VERSION eq '____PHPVERSION____'){
48  +  if (($phpldapadmin{'status'} || 'disabled') eq 'enabled'){  +  if (($phpldapadmin{'status'} || 'disabled') eq 'enabled'){
49  +    my $max_upload_size = ($phpldapadmin{MaxUploadSize} || '100M');# 104857600 bytes  +    my $max_upload_size = ($phpldapadmin{MaxUploadSize} || '100M');# 104857600 bytes
50  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);  +    $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/);


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