Logoj0ke.net Open Build Service > Projects > home:kries:proceed_dev > nginx_debug > Changes
Sign Up | Log In

Problem getting expanded diff: bad link: conflict in file nginx.spec

Difference Between Revision 2 and home:kries:proceed / nginx

[-] [+] Added nginx.changes
[-] [+] Changed nginx.spec ^
[-] [+] Added 2bc1dac6fb3ed263529decb211ec784824132bf4.patch ^
[-] [+] Added check_1.7.5+.patch ^
[-] [+] Added nginx-0.4.0-no_Werror.patch ^
[-] [+] Added nginx-0.4.0-perl_vendor_install.patch ^
[-] [+] Added nginx-0.6.31-DESTDIR.patch ^
[-] [+] Added nginx-0.6.31_default_config.patch ^
[-] [+] Added nginx-0.6.38-html.patch ^
[-] [+] Added openssl-rc4tilt.patch ^
[-] [+] Added openssl__chacha20_poly1305_draft_and_rfc_ossl102g.patch ^
Changed 1.12.34.2-x64.tar.gz ^
Added 1.13.35.1-x64.tar.gz ^
[-] [+] Changed _service ^
[-] [+] Added blockips.conf ^
[-] [+] Changed changelog ^
[-] [+] Added config ^
Deleted cscope.tmplst ^
[-] [+] Added magento-sample.conf-disabled ^
[-] [+] Changed naxsi-0.55.3.tar.gz/.travis.yml ^
[-] [+] Changed naxsi-0.55.3.tar.gz/README.md ^
[-] [+] Changed naxsi-0.55.3.tar.gz/naxsi_config/naxsi_core.rules ^
[-] [+] Changed naxsi-0.55.3.tar.gz/naxsi_src/Makefile ^
[-] [+] Changed naxsi-0.55.3.tar.gz/naxsi_src/naxsi.h ^
[-] [+] Changed naxsi-0.55.3.tar.gz/naxsi_src/naxsi_json.c ^
[-] [+] Changed naxsi-0.55.3.tar.gz/naxsi_src/naxsi_runtime.c ^
[-] [+] Changed naxsi-0.55.3.tar.gz/naxsi_src/naxsi_utils.c ^
[-] [+] Added naxsi-0.55.3.tar.gz/naxsi_src/nginx.conf.example ^
[-] [+] Changed naxsi-0.55.3.tar.gz/nxapi/README.md ^
[-] [+] Changed naxsi-0.55.3.tar.gz/nxapi/nxapi.json ^
[-] [+] Changed naxsi-0.55.3.tar.gz/nxapi/nxapi/nxparse.py ^
[-] [+] Changed naxsi-0.55.3.tar.gz/nxapi/nxtool.py ^
[-] [+] Changed naxsi-0.55.3.tar.gz/t/01naxsi_whitelists.t ^
[-] [+] Changed naxsi-0.55.3.tar.gz/t/02naxsi_bypass.t ^
[-] [+] Changed naxsi-0.55.3.tar.gz/t/11naxsi_newstyle_config.t ^
[-] [+] Changed naxsi-0.55.3.tar.gz/t/14json.t ^
[-] [+] Changed naxsi-0.55.3.tar.gz/t/28log.t ^
[-] [+] Changed naxsi-0.55.3.tar.gz/t/29regression.t ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/30regr.t ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/31norules.t ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/confs ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/confs/nginx.conf.example ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/confs/nginx_fuzz.conf.example ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/confs/ngx_cycle.patch ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/confs/ngx_process_cycle.patch ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/big-json-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/big-multipart-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/med-get-bad-format ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/med-get-with-path ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/med-json-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/med-multipart-file-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/med-multipart-post ^
Deleted naxsi-0.56.tar.gz/t/fuzz/med-post-non-ascii ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-get-nohost ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-get-sig ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-json-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-ko-get ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-multipart-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-ok-get ^
Deleted naxsi-0.56.tar.gz/t/fuzz/mini-unknown-CT-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-urlencded-post-2 ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/mini-urlencoded-post ^
[-] [+] Deleted naxsi-0.56.tar.gz/t/fuzz/small-multipart-post ^
Deleted naxsi-1.3.tar.gz ^
Deleted nginx-module-vts-0.1.18.tar.gz ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/HEAD ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/config ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/description ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/applypatch-msg.sample ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/commit-msg.sample ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/post-update.sample ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/pre-applypatch.sample ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/pre-commit.sample ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/pre-rebase.sample ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/prepare-commit-msg.sample ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/hooks/update.sample ^
Added nginx-rtmp-module-1.1.15.tar.gz/.git/index ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/info ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/info/exclude ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/logs ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/logs/HEAD ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/logs/refs ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/logs/refs/heads ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/logs/refs/heads/master ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/objects ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/objects/info ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/objects/pack ^
Added nginx-rtmp-module-1.1.15.tar.gz/.git/objects/pack/pack-3912c9200a41c4fbd876afb583ab7ecb4733401b.idx ^
Added nginx-rtmp-module-1.1.15.tar.gz/.git/objects/pack/pack-3912c9200a41c4fbd876afb583ab7ecb4733401b.pack ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/packed-refs ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/refs ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/refs/heads ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/refs/heads/master ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/refs/remotes ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/refs/remotes/origin ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/refs/remotes/origin/HEAD ^
[-] [+] Added nginx-rtmp-module-1.1.15.tar.gz/.git/refs/tags ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/dash/ngx_rtmp_dash_module.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/hls/ngx_rtmp_hls_module.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp.h ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp_access_module.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp_amf.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp_eval.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp_handler.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp_handshake.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp_init.c ^
[-] [+] Changed nginx-rtmp-module-1.1.15.tar.gz/ngx_rtmp_notify_module.c ^
Deleted nginx-rtmp-module-1.2.2.tar.gz ^
Added nginx_upstream_check_module-master.tar.gz ^
Deleted ngx_http_substitutions_filter_module-master.zip ^
Added ngx_pagespeed-1.12.34.2-stable.zip ^
Added ngx_pagespeed-1.12.34.3-stable.zip ^
Added ngx_pagespeed-1.13.35.1-beta.zip ^
Deleted ngx_pagespeed-1.13.35.2-stable.zip ^
Added ngx_pagespeed-latest-testing.zip ^
Added openssl-1.1.0c.tar.gz ^
Added openssl-1.1.0e.tar.gz ^
Added openssl-1.1.0f.tar.gz ^
Added openssl-1.1.0g.tar.gz ^
Added release-1.11.33.2-beta.zip ^
[-] [+] Changed ssl-ciphersample ^
Added v1.10.33.6-beta.zip ^