Forum: NGINX patch.spdy-55_1.3.11 broken?

I have patched the nginx sources with the latest spdy patch:

/usr/src/nginx-1.3.11# patch -p1 < patch.spdy-55_1.3.11.txt

but building the package isn't possible anymore:

dpkg-buildpackage -rfakeroot -uc -b
...
gcc -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Wformat-security  -I src/core -I src/event -I src/event/modules -I
src/os/unix -I objs -I src/http -I src/http/modules \
    -o objs/src/http/ngx_http_write_filter_module.o \
    src/http/ngx_http_write_filter_module.c
gcc -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Wformat-security  -I src/core -I src/event -I src/event/modules -I
src/os/unix -I objs -I src/http -I src/http/modules \
    -o objs/src/http/ngx_http_copy_filter_module.o \
    src/http/ngx_http_copy_filter_module.c
gcc -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Wformat-security  -I src/core -I src/event -I src/event/modules -I
src/os/unix -I objs -I src/http -I src/http/modules \
    -o objs/src/http/modules/ngx_http_log_module.o \
    src/http/modules/ngx_http_log_module.c
gcc -c -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat
-Wformat-security  -I src/core -I src/event -I src/event/modules -I
src/os/unix -I objs -I src/http -I src/http/modules \
    -o objs/src/http/ngx_http_request_body.o \
    src/http/ngx_http_request_body.c
src/http/ngx_http_request_body.c: In function
'ngx_http_discard_request_body':
src/http/ngx_http_request_body.c:479:10: error: 'ngx_http_request_t' has 
no
member named 'spdy_stream'
make[3]: *** [objs/src/http/ngx_http_request_body.o] Error 1
make[3]: Leaving directory `/usr/src/nginx-1.3.11'
make[2]: *** [build] Error 2
make[2]: Leaving directory `/usr/src/nginx-1.3.11'
dh_auto_build: make -j1 returned exit code 2
make[1]: *** [override_dh_auto_build] Error 2
make[1]: Leaving directory `/usr/src/nginx-1.3.11'
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

Posted at Nginx Forum: 
http://forum.nginx.org/read.php?2,235059,235059#msg-235059

On Monday 14 January 2013 20:06:25 philipp wrote:
> I have patched the nginx sources with the latest spdy patch:
>
> /usr/src/nginx-1.3.11# patch -p1 < patch.spdy-55_1.3.11.txt
>
> but building the package isn't possible anymore:
>

Yeap, fixed.

Also, please note, the "--with-http_spdy_module" сonfigure option is now
mandatory for SPDY.

See:
http://nginx.org/patches/spdy/CHANGES.txt
http://nginx.org/patches/spdy/README.txt

 wbr, Valentin V. Bartenev

>     -o objs/src/http/ngx_http_copy_filter_module.o \
>     src/http/ngx_http_request_body.c
> make[1]: Leaving directory `/usr/src/nginx-1.3.11'
> make: *** [build] Error 2
> dpkg-buildpackage: error: debian/rules build gave error exit status 2
>

Yeap, thatls

>>>>> "VVB" == Valentin V Bartenev <vbart@nginx.com> writes:

VVB> Yeap, fixed.

The patch at:

  http://nginx.org/patches/spdy/patch.spdy-58_1.3.11.txt

fails to apply to nginx-1.3.11 with 37 FAILs and 143 succeeds, 22 of
which need fuzz.

-JimC
--
James Cloos <cloos@jhcloos.com>         OpenPGP: 1024D/ED7DAEA6

Hi James,

On 1/17/13 2:16 AM, James Cloos wrote:
>
The following script works for me on FreeBSD box:

fetch -o- http://www.nginx.org/download/nginx-1.3.11.tar.gz | tar
zxvf - && fetch
http://nginx.org/patches/spdy/patch.spdy-58_1.3.11.txt && cd
nginx-1.3.11 && patch -p1 <../patch.spdy-58_1.3.11.txt

Please note that 'patch -C' could produce the (false) errors you
describe.

--
Maxim Konovalov
+7 (910) 4293178
http://nginx.com/support.html

Yes the latest patch (58) works fine.

Posted at Nginx Forum: 
http://forum.nginx.org/read.php?2,235059,235228#msg-235228

>>>>> "MK" == Maxim Konovalov <maxim@nginx.com> writes:

MK> The following script works for me on FreeBSD box:

MK> fetch -o- http://www.nginx.org/download/nginx-1.3.11.tar.gz | tar
MK> zxvf - && fetch
MK> http://nginx.org/patches/spdy/patch.spdy-58_1.3.11.txt && cd
MK> nginx-1.3.11 && patch -p1 <../patch.spdy-58_1.3.11.txt

MK> Please note that 'patch -C' could produce the (false) errors you
MK> describe.

On linux, using gnu patch, patch(1) and patch -C both tell me that -C is
not a valid option to patch.

But I see the problem; the single patch file is a set of incremental 
patches.

Unfortunately, gentoo's portage uses the --dry-run flag first, to
determine which -p option is required.  The earlier spdy patches worked
with that automation, but the hg changeset does not.

I'll post a bugz with them about that issue.

Is the hg repo with the spdy changes available anywhere?

-JimC
--
James Cloos <cloos@jhcloos.com>         OpenPGP: 1024D/ED7DAEA6

On Thursday 17 January 2013 20:18:08 James Cloos wrote:
[...]
> Is the hg repo with the spdy changes available anywhere?
>

No, there's not. I use mq extension to maintain these patches
based on our mercurial mirror: http://hg.nginx.org/

 wbr, Valentin V. Bartenev

--
http://nginx.com/support.html
http://nginx.org/en/donation.html