- Do the ssl_onceonlyinit() as last. This is how c-client creates

  the linkage.c (used by Pine).

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index 92de112e19babea4aa7b7263e8b0bacd428d8624..5f3ce88bde43f447188450b93a1746d085c1a30c 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -410,15 +410,10 @@ PHP_MINIT_FUNCTION(imap)
 #ifndef PHP_WIN32
        mail_link(&unixdriver);         /* link in the unix driver */
        mail_link(&mhdriver);           /* link in the mh driver */
-    /* mail_link(&mxdriver); */        /* According to c-client docs (internal.txt) this shouldn't be used. */
+       /* mail_link(&mxdriver); */     /* According to c-client docs (internal.txt) this shouldn't be used. */
        mail_link(&mmdfdriver);         /* link in the mmdf driver */
        mail_link(&newsdriver);         /* link in the news driver */
        mail_link(&philedriver);        /* link in the phile driver */
-       auth_link(&auth_log);           /* link in the log authenticator */
-       auth_link(&auth_md5);       /* link in the cram-md5 authenticator */ 
-#ifdef  HAVE_IMAP_SSL
-       ssl_onceonlyinit ();
-#endif
 #endif
        mail_link(&imapdriver);         /* link in the imap driver */
        mail_link(&nntpdriver);         /* link in the nntp driver */
@@ -428,6 +423,14 @@ PHP_MINIT_FUNCTION(imap)
        mail_link(&mtxdriver);          /* link in the mtx driver */
        mail_link(&dummydriver);        /* link in the dummy driver */
 
+#ifndef PHP_WIN32
+       auth_link(&auth_log);           /* link in the log authenticator */
+       auth_link(&auth_md5);       /* link in the cram-md5 authenticator */ 
+#ifdef  HAVE_IMAP_SSL
+       ssl_onceonlyinit ();
+#endif
+#endif
+
        /* lets allow NIL */
        REGISTER_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS);