Skip to content

Ddownload index, even when not presented with a Content-Length header (Fixes 430)

username-removed-25042 requested to merge pserwylo/fdroidclient:fix-430--download-without-content-length into master

This works for the index download, but still does not work for downloading .apks correctly. That is, the Android Download Manager needs one of:

  • Content-Length: ...
  • Connection: close
  • Transfer-Encoding: Chunked

headers to be set to work correctly. In the absence of all three of these, problems ensue. In fact in my toy web server, even the Connection: close did not seem to work correctly, but I'd be happy to be corrected on that. Either way, this is an improvement on what was there before.

For reference, here is my toy PHP web server, which can be saved in the root of the F-Droid repo and invoked with:

php -S 10.0.0.4:8888 no-headers.php

<?php

function streamFile( $file ) { $size     = filesize( $file );
        $contents = file_get_contents( $file );

        $buffer = (int)( $size / 5 );
        $bytes = 0;
        while ( $bytes < $size ) {
                $toStream = min( $size - $bytes, $buffer );
                echo substr( $contents, $bytes, $toStream );
                $bytes += $toStream;

                // Sleep to allow progress to be viewed in F-Droid
                sleep( 1 );
        }
}

$index    = "/fdroid/repo/index.jar";
$firefox  = "/fdroid/repo/fennec-40.0.multi.android-arm.apk";

// Test downloading a large .apk to see how it behaves
if ( $_SERVER['REQUEST_URI'] == "/fdroid/repo/fennec-40.0.multi.android-arm.apk" ) {
        $file = $firefox;
} else {
        $file = $index;
}

// Android Download Manager requires this (if not using Content-Length or Transfer-Encoding
// headers, but I can't seem to get it to work as expected).
header( "Connection: Close" );
streamFile( dirname( __FILE__ ) . $file );

Merge request reports