clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync HAVE_OPENSSL* symbols (#14333)

Browse Source 
This syncs few inconsistencies between the Windows and Autotools build
systems:
- HAVE_OPENSSL_EXT is now defined in the same style on both systems
  (undefined - extension is not available, defined to 1 - extension is
  available)
- HAVE_OPENSSL removed as it was only defined on Windows
This commit is contained in:
Peter Kokot 2024-06-11 19:18:19 +02:00 committed by GitHub
parent bfc988552f
commit 61a0e3bd19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UPGRADING.INTERNALS
View File

@ -156,6 +156,9 @@ PHP 8.4 INTERNALS UPGRADE NOTES
- Unused symbols CONFIGURATION_FILE_PATH, DISCARD_PATH, HAVE_ERRMSG_H,
HAVE_REGCOMP, HAVE_RINT, NEED_ISBLANK, PHP_URL_FOPEN, REGEX, HSREGEX,
USE_CONFIG_FILE have been removed.
- The HAVE_OPENSSL symbol has been removed.
- The HAVE_OPENSSL_EXT symbol is now consistently defined to value 1 whether
the openssl extension is available either as shared or built statically.
========================
3. Module changes

3
ext/openssl/config.w32
View File

@ -7,7 +7,6 @@ if (PHP_OPENSSL != "no") {
if (ret > 0) {
EXTENSION("openssl", "openssl.c xp_ssl.c");
AC_DEFINE("HAVE_OPENSSL_EXT", PHP_OPENSSL_SHARED ? 0 : 1, "Have openssl");
AC_DEFINE("HAVE_OPENSSL", 1);
AC_DEFINE("HAVE_OPENSSL_EXT", 1, "Define to 1 if the openssl extension is available.");
}
}

3
ext/openssl/config0.m4
View File

@ -21,7 +21,8 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
PHP_SUBST(OPENSSL_SHARED_LIBADD)
PHP_SETUP_OPENSSL([OPENSSL_SHARED_LIBADD],
[AC_DEFINE([HAVE_OPENSSL_EXT], [1], [ ])])
[AC_DEFINE([HAVE_OPENSSL_EXT], [1],
[Define to 1 if the openssl extension is available.])])
AC_CHECK_FUNCS([RAND_egd])

2
ext/openssl/php_openssl.h
View File

@ -17,7 +17,7 @@
#ifndef PHP_OPENSSL_H
#define PHP_OPENSSL_H
/* HAVE_OPENSSL would include SSL MySQL stuff */
#ifdef HAVE_OPENSSL_EXT
extern zend_module_entry openssl_module_entry;
#define phpext_openssl_ptr &openssl_module_entry

2
sapi/cgi/cgi_main.c
View File

@ -87,7 +87,7 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
#include "fastcgi.h"
#include "cgi_main_arginfo.h"
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL_EXT)
# include "openssl/applink.c"
#endif

2
sapi/cli/php_cli.c
View File

@ -88,7 +88,7 @@
# include "win32/select.h"
#endif
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL_EXT)
# include "openssl/applink.c"
#endif

2
sapi/phpdbg/phpdbg.c
View File

@ -33,7 +33,7 @@
#include "ext/standard/basic_functions.h"
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL_EXT)
# include "openssl/applink.c"
#endif