diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-11 13:34:18 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-11 13:34:18 +0000 |
commit | 7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3 (patch) | |
tree | 82e86e0db89a628266d910664d8e65192fc95016 | |
parent | 33a3895d788a631ffdae0eb02a385f54639de9eb (diff) | |
download | nixlib-7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3.tar nixlib-7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3.tar.gz nixlib-7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3.tar.bz2 nixlib-7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3.tar.lz nixlib-7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3.tar.xz nixlib-7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3.tar.zst nixlib-7ab993d0c4488dde04eca2d6bf8a4c1eab19edc3.zip |
* Catalyst::Engine::HTTP::Prefork: terminate chunked transfers
correctly. svn path=/nixpkgs/trunk/; revision=14504
-rw-r--r-- | pkgs/development/perl-modules/catalyst-fix-chunked-encoding.patch | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/perl-modules/catalyst-fix-chunked-encoding.patch b/pkgs/development/perl-modules/catalyst-fix-chunked-encoding.patch new file mode 100644 index 000000000000..7822128f8467 --- /dev/null +++ b/pkgs/development/perl-modules/catalyst-fix-chunked-encoding.patch @@ -0,0 +1,23 @@ +diff -rc Catalyst-Engine-HTTP-Prefork-0.50-orig/lib/Catalyst/Engine/HTTP/Prefork/Handler.pm Catalyst-Engine-HTTP-Prefork-0.50/lib/Catalyst/Engine/HTTP/Prefork/Handler.pm +*** Catalyst-Engine-HTTP-Prefork-0.50-orig/lib/Catalyst/Engine/HTTP/Prefork/Handler.pm 2008-03-14 18:23:47.000000000 +0100 +--- Catalyst-Engine-HTTP-Prefork-0.50/lib/Catalyst/Engine/HTTP/Prefork/Handler.pm 2009-03-11 14:18:40.000000000 +0100 +*************** +*** 199,206 **** + + if ( $self->{_chunked_res} ) { + if ( !$self->{_chunked_done} ) { +! # Write the final '0' chunk +! syswrite STDOUT, "0$CRLF"; + } + + delete $self->{_chunked_res}; +--- 199,207 ---- + + if ( $self->{_chunked_res} ) { + if ( !$self->{_chunked_done} ) { +! # Write the final '0' chunk and the CRLF that terminates +! # the chunked body. +! syswrite STDOUT, "0$CRLF$CRLF"; + } + + delete $self->{_chunked_res}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7c7ac9d04b3..1d7200a525bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4354,6 +4354,11 @@ let perlCookieXS perlHTTPHeaderParserXS ]; buildInputs = [perlTestPod perlTestPodCoverage]; + patches = [ + # Fix chunked transfers (they were missing the final CR/LF at + # the end, which makes curl barf). + ../development/perl-modules/catalyst-fix-chunked-encoding.patch + ]; }; perlCatalystManual = buildPerlPackage rec { |