Skip to content
This repository has been archived by the owner on Jan 21, 2022. It is now read-only.

Commit

Permalink
Upgrade Nginx to 1.4.5 [Finishes #61846156]
Browse files Browse the repository at this point in the history 
Signed-off-by: Maria Shaldibina <mariash@pivotallabs.com>
  • Loading branch information
@mariash
Tammer Saleh authored and mariash committed Feb 24, 2014
1 parent c6c63c0 commit e1ff1ed
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 481 deletions.
251 changes: 8 additions & 243 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,10 @@ is subject to the terms and conditions of the following licenses.

SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES

>>> devel-kit-v0.2.17rc2
>>> headers-more-0.15rc1
>>> lbase64-5.2
>>> lua-5.1.4
>>> lua-cjson-1.0.3
>>> lua-openssl-0.1.1
>>> nginx-0.8.54
>>> nginx-lua-0.3.1rc24
>>> nginx_upload_module-2.2.0
>>> pcre-8.12
>>> headers-more-0.25
>>> nginx-1.4.5
>>> nginx_upload_module-2.2
>>> pcre-8.34
>>> postgres-9.0.3-1.amd64
>>> postgres-9.0.3-1.i386
>>> postgresql-9.0.3
Expand Down Expand Up @@ -278,94 +272,8 @@ APPENDIX. Standard License Files
BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s).


>>> devel-kit-v0.2.17rc2

Copyright (c) 2010, Marcus Clyne, Simpl (simpl.it)
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
Neither the name of the organization (Simpl) nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL MARCUS CLYNE OR SIMPL BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


> Open SSL


ngx_devel_kit-0.2.17.tar.gz\ngx_devel_kit-0.2.17.tar\ngx_devel_kit-0.2.17\src\hash\md5.h



Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
All rights reserved.

This package is an SSL implementation written
by Eric Young (eay@cryptsoft.com).
The implementation was written so as to conform with Netscapes SSL.

This library is free for commercial and non-commercial use as long as
the following conditions are aheared to. The following conditions
apply to all code found in this distribution, be it the RC4, RSA,
lhash, DES, etc., code; not just the SSL code. The SSL documentation
included with this distribution is covered by the same copyright terms
except that the holder is Tim Hudson (tjh@cryptsoft.com).

Copyright remains Eric Young's, and as such any Copyright notices in
the code are not to be removed.
If this package is used in a product, Eric Young should be given attribution
as the author of the parts of the library used.
This can be in the form of a textual message at program startup or
in documentation (online or textual) provided with the package.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. All advertising materials mentioning features or use of this software
must display the following acknowledgement:
"This product includes cryptographic software written by
Eric Young (eay@cryptsoft.com)"
The word 'cryptographic' can be left out if the rouines from the library
being used are not cryptographic related :-).
4. If you include any Windows specific code (or a derivative thereof) from
the apps directory (application code) you must include an acknowledgement:
"This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.


>>> headers-more-0.15rc1
>>> headers-more-0.25

Copyright & License
The code base is borrowed directly from the standard headers module in
Expand Down Expand Up @@ -404,112 +312,7 @@ Copyright & License
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


>>> lbase64-5.2

lbase64.c
base64 encoding and decoding for Lua 5.2
Luiz Henrique de Figueiredo <lhf@tecgraf.puc-rio.br>
07 Aug 2012 23:22:44
This code is hereby placed in the public domain.


>>> lua-5.1.4

Lua License
-----------

Lua is licensed under the terms of the MIT license reproduced below.
This means that Lua is free software and can be used for both academic
and commercial purposes at absolutely no cost.

For details and rationale, see http://www.lua.org/license.html .

===============================================================================

Copyright (C) 1994-2008 Lua.org, PUC-Rio.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

===============================================================================

(end of COPYRIGHT)


>>> lua-cjson-1.0.3

Copyright (c) 2010-2011 Mark Pulford <mark@kyne.com.au>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


>>> lua-openssl-0.1.1

LICENSE ISSUES
==============

lua-openssl based on lua and openssl, and steal some idea and code from php,
so lua-openssl is a opensource software.

lua-openssl LICENSE
===================

--------------------------------------------------------------------
Copyright (c) 2011 - 2012 zhaozg, zhaozg(at)gmail.com

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.


>>> nginx-0.8.54
>>> nginx-1.4.5

Copyright (C) 2002-2011 Igor Sysoev

Expand All @@ -534,45 +337,7 @@ Copyright (C) 2002-2011 Igor Sysoev
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.


>>> nginx-lua-0.3.1rc24

Copyright & License
This module is licenced under the BSD license.

Copyright (C) 2009, 2010, 2011, by Xiaozhe Wang (chaoslawful)
<chaoslawful@gmail.com>.

Copyright (C) 2009, 2010, 2011, by Zhang "agentzh" Yichun ()
<agentzh@gmail.com>.

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


>>> nginx_upload_module-2.2.0
>>> nginx_upload_module-2.2

Copyright (c) 2006, 2008, Valery Kholodkov
All rights reserved.
Expand Down Expand Up @@ -600,7 +365,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


>>> pcre-8.12
>>> pcre-8.34

Copyright (c) 2007-2010, Google Inc.
All rights reserved.
Expand Down
60 changes: 20 additions & 40 deletions config/blobs.yml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,4 @@
---
nginx/lbase64.tar.gz:
object_id: rest/objects/4e4e78bca11e122004e4e8ec64843104f30681768835
sha: 5692619dae780dbdf9edc994f9dcd7dce7b24646
size: 2503
nginx/nginx-0.8.54.tar.gz:
object_id: rest/objects/4e4e78bca21e121004e4e7d511f55304f30681c8628c
sha: 4d63c35b8974dba42cc62dd5046ae89df3528e34
size: 650001
nginx/nginx_upload_module-2.2.0.tar.gz:
object_id: rest/objects/4e4e78bca61e122004e4e8ec6b44b604f3068226fc04
sha: 93d6e83e613a0ce2ed057a434b344fa1b6609b47
size: 25796
nginx/lua-openssl-0.1.1.tar.gz:
object_id: rest/objects/4e4e78bca31e121004e4e7d514745f04f3068277861c
sha: 27f38b3f7d44f59690ed081f892891a35a5ebfaa
size: 69253
nginx/devel-kit-v0.2.17rc2.tar.gz:
object_id: rest/objects/4e4e78bca31e122004e4e8ec646e2104f30682c8d7c1
sha: 7eadfe53d674972c0f7f27d7b26eff95829bc0b2
size: 64964
nginx/lua-cjson-1.0.3.tar.gz:
object_id: rest/objects/4e4e78bca61e121004e4e7d51d950e04f3068319c0bb
sha: 7335961ff6619a7eae824e8cf9432100ca377476
size: 31780
nginx/headers-more-v0.15rc1.tgz:
object_id: rest/objects/4e4e78bca41e122004e4e8ec65f67f04f306836ac70d
sha: ba7bf757be8004d9dbffbe583396620cfcbed788
size: 25490
nginx/nginx-lua.v0.3.1rc24.tar.gz:
object_id: rest/objects/4e4e78bca31e121004e4e7d514745f04f30683bdcc21
sha: f06e390cc81f82b05a06451bf7b287b7d4fb1640
size: 207185
nginx/pcre-8.12.tar.gz:
object_id: rest/objects/4e4e78bca51e122004e4e8ec68407704f30684124f4c
sha: b3ab606864606c9f980045653554bf4a12cadde2
size: 1316863
nginx/lua-5.1.4.tar.gz:
object_id: rest/objects/4e4e78bca21e121004e4e7d511f55304f306846c9fe6
sha: 2b11c8e60306efb7f0734b747588f57995493db7
size: 216679
sqlite/sqlite-autoconf-3070500.tar.gz:
object_id: rest/objects/4e4e78bca11e121004e4e7d511f82104f3068661ccfa
sha: 4e1338497b8da50b84307191bb3418e9ec5715d7
Expand Down Expand Up @@ -573,3 +533,23 @@ golang/go1.2.linux-amd64.tar.gz:
sha: !binary |-
NjY0ZTUwMjVlYWU5MTQxMmE5NmExMGY0ZWQxYThhZjZmMGYzMmI3ZA==
size: 55966325
nginx/headers-more-v0.25.tgz:
object_id: a621718d-df24-4205-ba31-6ed8a212732e
sha: !binary |-
NTE0YmMzZGYzMGIyNGViMGEwNjUzM2YxZWJhYTU3OWI4OTg5OTBmNQ==
size: 27973
nginx/nginx-1.4.5.tar.gz:
object_id: 8001e14c-1629-4305-bd5a-02e6ec9faa04
sha: !binary |-
OTZjMWFlY2QzMTRmNzNhM2MzMGEwZGI4YzM5YWQxNWRkYWNiMDc0ZQ==
size: 768728
nginx/nginx-upload-module-2.2.tar.gz:
object_id: 502854f1-9823-468f-baef-1a8d68823ead
sha: !binary |-
NzRjY2QxMTY1MjVhMTU1ZGI3NmY5MmExY2Q0ODRkOTUxNmE3MDM5OA==
size: 28505
nginx/pcre-8.34.tar.gz:
object_id: ee5bee99-dda0-4d81-be88-a7a1a901dae7
sha: !binary |-
ZDQ2ZTUzNzMzN2VlNzBkZjE5MDg0MDAxYTRiNjgxNWIzZDY5ZmU2Yw==
size: 1933734
Loading

0 comments on commit e1ff1ed

Please sign in to comment.