com php-src: integrate the applink shim in the other bins: sapi/cgi/cgi_main.c sapi/phpdbg/phpdbg.c
| From: | Anatol Belski | Date: | Fri, 03 Jul 2015 05:11:14 +0000 |
| Subject: | com php-src: integrate the applink shim in the other bins: sapi/cgi/cgi_main.c sapi/phpdbg/phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87721@lists.php.net to get a copy of this message | ||
Commit: 3d7343f609b81ebac95d94480a2615df530806e7
Author: Anatol Belski <ab@php.net> Fri, 3 Jul 2015 07:10:46 +0200
Parents: 59444347d1c33020d571bb8e8649e7aad432c913
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3d7343f609b81ebac95d94480a2615df530806e7
Log:
integrate the applink shim in the other bins
Changed paths:
M sapi/cgi/cgi_main.c
M sapi/phpdbg/phpdbg.c
Diff:
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index cc04f34..3de902a 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -92,6 +92,10 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
#include "fastcgi.h"
+#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
+# include "openssl/applink.c"
+#endif
+
#ifndef PHP_WIN32
/* XXX this will need to change later when threaded fastcgi is implemented. shane */
struct sigaction act, old_term, old_quit, old_int;
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 339102c..31dab3f 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -48,6 +48,10 @@
# include <arpa/inet.h>
#endif /* }}} */
+#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
+# include "openssl/applink.c"
+#endif
+
ZEND_DECLARE_MODULE_GLOBALS(phpdbg);
int phpdbg_startup_run = 0;