boklm pushed to branch maint-14.5 at The Tor Project / Applications / tor-browser-build

Commits:

1 changed file:

Changes:

  • tools/update-responses/update_responses
    ... ... @@ -408,10 +408,12 @@ sub write_responses {
    408 408
         my $versions_str = join('+', @$versions);
    
    409 409
         foreach my $os (keys %oses) {
    
    410 410
             my $resp = get_response($config, $versions, $os);
    
    411
    -        write_htdocs($channel, $os, "$versions_str-$os.xml", $resp);
    
    411
    +        write_htdocs($channel, $os, "update-$versions_str-$os.xml", $resp);
    
    412 412
             foreach my $from_version (keys %from_versions) {
    
    413
    +            next unless grep {
    
    414
    +                $config->{versions}{$_}{files}{$os}{partial}{$from_version} } @$versions;
    
    413 415
                 $resp = get_response($config, $versions, $os, $from_version);
    
    414
    -            write_htdocs($channel, $os, "$from_version-$versions_str-$os.xml", $resp);
    
    416
    +            write_htdocs($channel, $os, "update-$from_version-$versions_str-$os.xml", $resp);
    
    415 417
             }
    
    416 418
             write_htdocs($channel, $os, 'no-update.xml',
    
    417 419
                 '<?xml version="1.0" encoding="UTF-8"?>'
    
    ... ... @@ -443,18 +445,19 @@ sub write_htaccess {
    443 445
                 }
    
    444 446
             }
    
    445 447
         }
    
    446
    -    foreach my $version (@$versions) {
    
    447
    -        my $files = $config->{versions}{$version}{files};
    
    448
    -        foreach my $os (sort keys %oses) {
    
    449
    -            my $htaccess_os = "RewriteEngine On\n";
    
    448
    +    foreach my $os (sort keys %oses) {
    
    449
    +        my $htaccess_os = "RewriteEngine On\n";
    
    450
    +        foreach my $version (@$versions) {
    
    450 451
                 $htaccess_os .= "RewriteRule ^$version/ no-update.xml [last]\n";
    
    451
    -            foreach my $from_version (sort keys %from_versions) {
    
    452
    -                $htaccess_os .= "RewriteRule ^$from_version/ "
    
    453
    -                             .  "$from_version-$versions_str-$os.xml [last]\n";
    
    454
    -            }
    
    455
    -            $htaccess_os .= "RewriteRule ^[^\/]+/ $versions_str-$os.xml [last]\n";
    
    456
    -            write_htdocs($channel, $os, '.htaccess', $htaccess_os);
    
    457 452
             }
    
    453
    +        foreach my $from_version (sort keys %from_versions) {
    
    454
    +            next unless grep {
    
    455
    +                $config->{versions}{$_}{files}{$os}{partial}{$from_version} } @$versions;
    
    456
    +            $htaccess_os .= "RewriteRule ^$from_version/ "
    
    457
    +                         .  "update-$from_version-$versions_str-$os.xml [last]\n";
    
    458
    +        }
    
    459
    +        $htaccess_os .= "RewriteRule ^[^\/]+/ update-$versions_str-$os.xml [last]\n";
    
    460
    +        write_htdocs($channel, $os, '.htaccess', $htaccess_os);
    
    458 461
         }
    
    459 462
     }
    
    460 463