Merge in recent changes from 0.9.6-stable.

diff --git a/crypto/bio/b_print.c b/crypto/bio/b_print.c
index d7a60eceea38dad23cb3fe449349fbeafa3bc0d7..bbd510170b5103f2970ef0a205a47b4f8a028c4b 100644 (file)
--- a/crypto/bio/b_print.c
+++ b/crypto/bio/b_print.c
@@ -762,7 +762,9 @@ int BIO_vprintf (BIO *bio, const char *format, va_list args)
        {
        int ret;
        size_t retlen;
-       MS_STATIC char hugebuf[1024*10];
+       char hugebuf[1024*2];   /* Was previously 10k, which is unreasonable
+                                  in small-stack environments, like threads
+                                  or DOS programs. */
        char *hugebufp = hugebuf;
        size_t hugebufsize = sizeof(hugebuf);
        char *dynbuf = NULL;