Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
base: ad1e1af5ad3f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 2d9454702e57
Choose a head ref
  • 16 commits
  • 31 files changed
  • 8 contributors

Commits on Jan 2, 2020

  1. Copy the full SHA
    0b5c626 View commit details
    Browse the repository at this point in the history
  2. nginx: Clear Last-Modified if ETag is from store

    This is what I've suspected a while ago[1]:
    
    > Heads-up everyone: After testing this in a few production instances,
    > it seems that some browsers still get cache hits for new store paths
    > (and changed contents) for some reason. I highly suspect that it might
    > be due to the last-modified header (as mentioned in [2]).
    >
    > Going to test this with last-modified disabled for a little while and
    > if this is the case I think we should improve that patch by disabling
    > last-modified if serving from a store path.
    
    Much earlier[2] when I reviewed the patch, I wrote this:
    
    > Other than that, it looks good to me.
    >
    > However, I'm not sure what we should do with Last-Modified header.
    > From RFC 2616, section 13.3.4:
    >
    > - If both an entity tag and a Last-Modified value have been
    >   provided by the origin server, SHOULD use both validators in
    >   cache-conditional requests. This allows both HTTP/1.0 and
    >   HTTP/1.1 caches to respond appropriately.
    >
    > I'm a bit nervous about the SHOULD here, as user agents in the wild
    > could possibly just use Last-Modified and use the cached content
    > instead.
    
    Unfortunately, I didn't pursue this any further back then because
    @pbogdan noted[3] the following:
    
    > Hmm, could they (assuming they are conforming):
    >
    >  * If an entity tag has been provided by the origin server, MUST
    >    use that entity tag in any cache-conditional request (using If-
    >    Match or If-None-Match).
    
    Since running with this patch in some deployments, I found that both
    Firefox and Chrome/Chromium do NOT re-validate against the ETag if the
    Last-Modified header is still the same.
    
    So I wrote a small NixOS VM test with Geckodriver to have a test case
    which is closer to the real world and I indeed was able to reproduce
    this.
    
    Whether this is actually a bug in Chrome or Firefox is an entirely
    different issue and even IF it is the fault of the browsers and it is
    fixed at some point, we'd still need to handle this for older browser
    versions.
    
    Apart from clearing the header, I also recreated the patch by using a
    plain "git diff" with a small description on top. This should make it
    easier for future authors to work on that patch.
    
    [1]: NixOS/nixpkgs#48337 (comment)
    [2]: NixOS/nixpkgs#48337 (comment)
    [3]: NixOS/nixpkgs#48337 (comment)
    
    Signed-off-by: aszlig <aszlig@nix.build>
    (cherry picked from commit ccf55be)
    Reason: The issue breaks setups that serve static content via Nix store
            paths. I've also backported the NixOS VM test from Python to
            Perl.
    aszlig committed Jan 2, 2020
    Copy the full SHA
    f7bc988 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. wireguard-tools: 1.0.20191226 -> 1.0.20200102

    (cherry picked from commit fad24a7)
    Ma27 committed Jan 3, 2020
    Copy the full SHA
    4e3a453 View commit details
    Browse the repository at this point in the history
  2. docker: 19.03.4 -> 19.03.5

    (cherry picked from commit 31d2d5a)
    zowoq authored and alyssais committed Jan 3, 2020
    Copy the full SHA
    7572786 View commit details
    Browse the repository at this point in the history
  3. gitlab-shell: 10.2.0 -> 10.3.0

    (cherry picked from commit 6972aec)
    talyz authored and flokli committed Jan 3, 2020
    Copy the full SHA
    dbc7909 View commit details
    Browse the repository at this point in the history
  4. gitlab-workhorse: 8.14.1 -> 8.18.0

    (cherry picked from commit 2f61471)
    talyz authored and flokli committed Jan 3, 2020
    Copy the full SHA
    9fc0570 View commit details
    Browse the repository at this point in the history
  5. gitaly: 1.72.1 -> a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83

    For some reason this untagged commit is the one referred to in the
    main repository; this might be a mistake, but we'll have to package it
    for now to follow upstream.
    
    (cherry picked from commit 445bc14)
    talyz authored and flokli committed Jan 3, 2020
    Copy the full SHA
    18469ac View commit details
    Browse the repository at this point in the history
  6. gitlab: update.py: Get go deps for gitlab-shell from the root dir

    GitLab Shell now has the go.mod and go.sum files in the root of the
    repo; the go subdirectory has been removed and all the code in it has
    been moved up to the root.
    
    (cherry picked from commit a3c72e6)
    talyz authored and flokli committed Jan 3, 2020
    Copy the full SHA
    7ce433c View commit details
    Browse the repository at this point in the history
  7. gitlab: 12.5.5 -> 12.6.0

    (cherry picked from commit ff28cfa)
    talyz authored and flokli committed Jan 3, 2020
    Copy the full SHA
    c93501d View commit details
    Browse the repository at this point in the history
  8. gitlab: 12.6.0 -> 12.6.1

    (cherry picked from commit 0825e38)
    talyz authored and flokli committed Jan 3, 2020
    Copy the full SHA
    fd7ce83 View commit details
    Browse the repository at this point in the history
  9. Copy the full SHA
    7201d23 View commit details
    Browse the repository at this point in the history
  10. libbladerf: 2.2.0 -> 2.2.1

    (cherry picked from commit 0a65d1c)
    sbourdeauducq authored and markuskowa committed Jan 3, 2020
    Copy the full SHA
    e8c7d31 View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    28c3715 View commit details
    Browse the repository at this point in the history
  12. xcode: don’t use libstdc++ on iOS

    Apple no longer ships with it, so best to avoid forcing it into use.
    matthewbauer committed Jan 3, 2020
    Copy the full SHA
    3432b1b View commit details
    Browse the repository at this point in the history
  13. ghc: always use llvm with iOS

    Even when building for the simulator.
    matthewbauer committed Jan 3, 2020
    Copy the full SHA
    036cef9 View commit details
    Browse the repository at this point in the history
  14. Merge pull request #76070 from matthewbauer/ios-with-xcode-11-cherry-…

    …pick-for-1909
    
    iOS with xcode 11 cherry pick for 19.09
    matthewbauer committed Jan 3, 2020
    Copy the full SHA
    2d94547 View commit details
    Browse the repository at this point in the history