Skip to content

Commit b1f33db

Browse files
committed
backport 5944434 and 3d7343f
1 parent 8c70007 commit b1f33db

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

sapi/cgi/cgi_main.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
9292

9393
#include "fastcgi.h"
9494

95+
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
96+
# include "openssl/applink.c"
97+
#endif
98+
9599
#ifndef PHP_WIN32
96100
/* XXX this will need to change later when threaded fastcgi is implemented. shane */
97101
struct sigaction act, old_term, old_quit, old_int;

sapi/cli/php_cli.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@
9595
# include "win32/select.h"
9696
#endif
9797

98+
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
99+
# include "openssl/applink.c"
100+
#endif
101+
98102
PHPAPI extern char *php_ini_opened_path;
99103
PHPAPI extern char *php_ini_scanned_path;
100104
PHPAPI extern char *php_ini_scanned_files;

sapi/phpdbg/phpdbg.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
# include <arpa/inet.h>
4242
#endif /* }}} */
4343

44+
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
45+
# include "openssl/applink.c"
46+
#endif
47+
4448
ZEND_DECLARE_MODULE_GLOBALS(phpdbg);
4549

4650
static zend_bool phpdbg_booted = 0;

0 commit comments

Comments
 (0)