[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-14.5] 3 commits: Bug 41449: Add prefix to update-responses xml files

Title: GitLab

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

Commits:

  • 6abd378b
    by Nicolas Vigier at 2025-05-16T11:54:26+02:00 
    Bug 41449: Add prefix to update-responses xml files
  • 20fbc1d8
    by Nicolas Vigier at 2025-05-16T11:54:30+02:00 
    Bug 41451: Add missing no-update.xml redirects

We were doing a foreach loop on versions when writing the per OS
.htaccess, always writing to the same .htacess file, meaning only the
last one was kept. However the version number is only used for the
no-update.xml redirect, so we move the loop there, to have a
no-update.xml for each version.
  • 0542d0ec
    by Nicolas Vigier at 2025-05-16T11:54:40+02:00 
    Bug 41452: Skip update-responses xml files for versions which don't have incremental

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

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx