Author: mdounin
Date: 2012-06-05 13:17:05 +0000 (Tue, 05 Jun 2012)
New Revision: 4673
URL: http://trac.nginx.org/nginx/changeset/4673/nginx

Log:
Merge of r4632: updated openssl used for win32 builds.


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

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-06-04 14:23:27 UTC (rev 4672)
+++ branches/stable-1.2 2012-06-05 13:17:05 UTC (rev 4673)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4631,4641
+/trunk:4611-4632,4641
\ No newline at end of property
Modified: branches/stable-1.2/misc/GNUmakefile
===================================================================
--- branches/stable-1.2/misc/GNUmakefile 2012-06-04 14:23:27 UTC (rev 4672)
+++ branches/stable-1.2/misc/GNUmakefile 2012-06-05 13:17:05 UTC (rev 4673)
@@ -6,7 +6,7 @@
REPO = $(shell svn info | sed -n 's/^Repository Root: //p')

OBJS = objs.msvc8
-OPENSSL = openssl-1.0.0i
+OPENSSL = openssl-1.0.1c
ZLIB = zlib-1.2.5
PCRE = pcre-8.30


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel