[nginx] svn commit: r5067 - in branches/stable-1.2: . misc

Mon Feb 11 23:57:14 UTC 2013

Author: mdounin
Date: 2013-02-11 23:57:13 +0000 (Mon, 11 Feb 2013)
New Revision: 5067
URL: http://trac.nginx.org/nginx/changeset/5067/nginx

Log:
Merge of r5005, r5031, r5066: PCRE and OpenSSL for win32 builds.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/misc/GNUmakefile

Index: branches/stable-1.2
===================================================================

--- branches/stable-1.2	2013-02-11 23:37:20 UTC (rev 5066)
+++ branches/stable-1.2	2013-02-11 23:57:13 UTC (rev 5067)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5004,5011-5025,5027-5030
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066
\ No newline at end of property
Modified: branches/stable-1.2/misc/GNUmakefile
===================================================================
--- branches/stable-1.2/misc/GNUmakefile	2013-02-11 23:37:20 UTC (rev 5066)
+++ branches/stable-1.2/misc/GNUmakefile	2013-02-11 23:57:13 UTC (rev 5067)
@@ -6,9 +6,9 @@
 REPO =		$(shell svn info | sed -n 's/^Repository Root: //p')
 
 OBJS =		objs.msvc8
-OPENSSL =	openssl-1.0.1c
+OPENSSL =	openssl-1.0.1e
 ZLIB =		zlib-1.2.7
-PCRE =		pcre-8.31
+PCRE =		pcre-8.32
 
 
 release:

