Patch HAS_VISIBILITY_CFLAGS for *Compile Issues Bug #77883
Patch version 2019-06-12 12:21 UTC
Return to Bug #77883 |
Download this patch
Patch Revisions:
Developer: php@geoff.dj
diff -bBr -U 5 php-7.2.19/ext/bz2/php_bz2.h php-7.2.19_77883/ext/bz2/php_bz2.h
--- php-7.2.19/ext/bz2/php_bz2.h 2019-05-29 11:14:37.000000000 +0400
+++ php-7.2.19_77883/ext/bz2/php_bz2.h 2019-06-12 14:38:56.000000000 +0400
@@ -39,11 +39,11 @@
# elif defined(COMPILE_DL_BZ2)
# define PHP_BZ2_API __declspec(dllimport)
# else
# define PHP_BZ2_API /* nothing special */
# endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_BZ2_API __attribute__ ((visibility("default")))
#else
# define PHP_BZ2_API
#endif
diff -bBr -U 5 php-7.2.19/ext/com_dotnet/php_com_dotnet.h php-7.2.19_77883/ext/com_dotnet/php_com_dotnet.h
--- php-7.2.19/ext/com_dotnet/php_com_dotnet.h 2019-05-29 11:14:41.000000000 +0400
+++ php-7.2.19_77883/ext/com_dotnet/php_com_dotnet.h 2019-06-12 14:37:54.000000000 +0400
@@ -28,11 +28,11 @@
#include "TSRM.h"
#endif
#ifdef PHP_WIN32
# define PHP_COM_DOTNET_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_COM_DOTNET_API __attribute__ ((visibility("default")))
#else
# define PHP_COM_DOTNET_API
#endif
diff -bBr -U 5 php-7.2.19/ext/curl/php_curl.h php-7.2.19_77883/ext/curl/php_curl.h
--- php-7.2.19/ext/curl/php_curl.h 2019-05-29 11:14:40.000000000 +0400
+++ php-7.2.19_77883/ext/curl/php_curl.h 2019-06-12 14:39:25.000000000 +0400
@@ -34,11 +34,11 @@
#define PHP_CURL_DEBUG 0
#ifdef PHP_WIN32
# define PHP_CURL_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_CURL_API __attribute__ ((visibility("default")))
#else
# define PHP_CURL_API
#endif
diff -bBr -U 5 php-7.2.19/ext/dom/xml_common.h php-7.2.19_77883/ext/dom/xml_common.h
--- php-7.2.19/ext/dom/xml_common.h 2019-05-29 11:14:42.000000000 +0400
+++ php-7.2.19_77883/ext/dom/xml_common.h 2019-06-12 14:35:54.000000000 +0400
@@ -45,11 +45,11 @@
# elif !defined(DOM_LOCAL_DEFINES) /* Allow to counteract LNK4049 warning. */
# define PHP_DOM_EXPORT __declspec(dllimport)
# else
# define PHP_DOM_EXPORT
# endif /* DOM_EXPORTS */
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_DOM_EXPORT __attribute__ ((visibility("default")))
#elif defined(PHPAPI)
# define PHP_DOM_EXPORT PHPAPI
#else
# define PHP_DOM_EXPORT
diff -bBr -U 5 php-7.2.19/ext/gd/php_gd.h php-7.2.19_77883/ext/gd/php_gd.h
--- php-7.2.19/ext/gd/php_gd.h 2019-05-29 11:14:40.000000000 +0400
+++ php-7.2.19_77883/ext/gd/php_gd.h 2019-06-12 14:35:38.000000000 +0400
@@ -50,11 +50,11 @@
#define PHP_GDIMG_TYPE_WEBP 11
#define PHP_GDIMG_TYPE_BMP 12
#ifdef PHP_WIN32
# define PHP_GD_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_GD_API __attribute__ ((visibility("default")))
#else
# define PHP_GD_API
#endif
diff -bBr -U 5 php-7.2.19/ext/hash/php_hash.h php-7.2.19_77883/ext/hash/php_hash.h
--- php-7.2.19/ext/hash/php_hash.h 2019-05-29 11:14:39.000000000 +0400
+++ php-7.2.19_77883/ext/hash/php_hash.h 2019-06-12 14:37:22.000000000 +0400
@@ -122,11 +122,11 @@
extern zend_module_entry hash_module_entry;
#define phpext_hash_ptr &hash_module_entry
#ifdef PHP_WIN32
# define PHP_HASH_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_HASH_API __attribute__ ((visibility("default")))
#else
# define PHP_HASH_API
#endif
diff -bBr -U 5 php-7.2.19/ext/imap/php_imap.c php-7.2.19_77883/ext/imap/php_imap.c
--- php-7.2.19/ext/imap/php_imap.c 2019-05-29 11:14:38.000000000 +0400
+++ php-7.2.19_77883/ext/imap/php_imap.c 2019-06-12 14:37:02.000000000 +0400
@@ -66,11 +66,11 @@
#define PHP_IMAP_ADDRESS_SIZE_BUF 10
#ifndef SENDBUFLEN
#define SENDBUFLEN 16385
#endif
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
#else
# define PHP_IMAP_EXPORT
#endif
diff -bBr -U 5 php-7.2.19/ext/mbstring/libmbfl/mbfl/mbfl_defs.h php-7.2.19_77883/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
--- php-7.2.19/ext/mbstring/libmbfl/mbfl/mbfl_defs.h 2019-05-29 11:14:38.000000000 +0400
+++ php-7.2.19_77883/ext/mbstring/libmbfl/mbfl/mbfl_defs.h 2019-06-12 14:38:33.000000000 +0400
@@ -44,11 +44,11 @@
#define MBFLAPI __declspec(dllexport)
#else
#define MBFLAPI __declspec(dllimport)
#endif /* MBFL_DLL_EXPORT */
#else
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && defined(_HAS_VISIBILITY)
#define MBFLAPI __attribute__((visibility("default")))
#else
#define MBFLAPI
#endif /* defined(__GNUC__) && __GNUC__ >= 4 */
#endif /* WIN32 */
diff -bBr -U 5 php-7.2.19/ext/mbstring/mbstring.h php-7.2.19_77883/ext/mbstring/mbstring.h
--- php-7.2.19/ext/mbstring/mbstring.h 2019-05-29 11:14:38.000000000 +0400
+++ php-7.2.19_77883/ext/mbstring/mbstring.h 2019-06-12 14:38:46.000000000 +0400
@@ -61,11 +61,11 @@
# elif defined(COMPILE_DL_MBSTRING)
# define MBSTRING_API __declspec(dllimport)
# else
# define MBSTRING_API /* nothing special */
# endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# undef MBSTRING_API
# define MBSTRING_API __attribute__ ((visibility("default")))
#else
# undef MBSTRING_API
# define MBSTRING_API /* nothing special */
diff -bBr -U 5 php-7.2.19/ext/odbc/php_odbc.h php-7.2.19_77883/ext/odbc/php_odbc.h
--- php-7.2.19/ext/odbc/php_odbc.h 2019-05-29 11:14:41.000000000 +0400
+++ php-7.2.19_77883/ext/odbc/php_odbc.h 2019-06-12 14:38:17.000000000 +0400
@@ -101,11 +101,11 @@
PHP_FUNCTION(odbc_specialcolumns);
PHP_FUNCTION(odbc_statistics);
#ifdef PHP_WIN32
# define PHP_ODBC_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_ODBC_API __attribute__ ((visibility("default")))
#else
# define PHP_ODBC_API
#endif
diff -bBr -U 5 php-7.2.19/ext/pcre/pcrelib/config.h php-7.2.19_77883/ext/pcre/pcrelib/config.h
--- php-7.2.19/ext/pcre/pcrelib/config.h 2019-05-29 11:14:39.000000000 +0400
+++ php-7.2.19_77883/ext/pcre/pcrelib/config.h 2019-06-12 14:37:43.000000000 +0400
@@ -13,11 +13,11 @@
#undef PACKAGE_STRING
#define SUPPORT_UCP
#define SUPPORT_UTF8
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# ifdef __cplusplus
# define PCRE_EXP_DECL extern "C" __attribute__ ((visibility("default")))
# else
# define PCRE_EXP_DECL extern __attribute__ ((visibility("default")))
# endif
diff -bBr -U 5 php-7.2.19/ext/pdo/php_pdo.h php-7.2.19_77883/ext/pdo/php_pdo.h
--- php-7.2.19/ext/pdo/php_pdo.h 2019-05-29 11:14:38.000000000 +0400
+++ php-7.2.19_77883/ext/pdo/php_pdo.h 2019-06-12 14:39:06.000000000 +0400
@@ -35,11 +35,11 @@
# elif defined(COMPILE_DL_PDO)
# define PDO_API __declspec(dllimport)
# else
# define PDO_API /* nothing special */
# endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PDO_API __attribute__ ((visibility("default")))
#else
# define PDO_API /* nothing special */
#endif
diff -bBr -U 5 php-7.2.19/ext/pgsql/php_pgsql.h php-7.2.19_77883/ext/pgsql/php_pgsql.h
--- php-7.2.19/ext/pgsql/php_pgsql.h 2019-05-29 11:14:41.000000000 +0400
+++ php-7.2.19_77883/ext/pgsql/php_pgsql.h 2019-06-12 14:39:15.000000000 +0400
@@ -45,11 +45,11 @@
#else
#define PHP_PGSQL_API __declspec(dllimport)
#endif
#else
#include <libpq/libpq-fs.h>
-# if defined(__GNUC__) && __GNUC__ >= 4
+# if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_PGSQL_API __attribute__ ((visibility("default")))
# else
# define PHP_PGSQL_API
# endif
#endif
diff -bBr -U 5 php-7.2.19/ext/skeleton/php_skeleton.h php-7.2.19_77883/ext/skeleton/php_skeleton.h
--- php-7.2.19/ext/skeleton/php_skeleton.h 2019-05-29 11:14:37.000000000 +0400
+++ php-7.2.19_77883/ext/skeleton/php_skeleton.h 2019-06-12 14:36:12.000000000 +0400
@@ -8,11 +8,11 @@
#define PHP_EXTNAME_VERSION "0.1.0" /* Replace with version number for your extension */
#ifdef PHP_WIN32
# define PHP_EXTNAME_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_EXTNAME_API __attribute__ ((visibility("default")))
#else
# define PHP_EXTNAME_API
#endif
diff -bBr -U 5 php-7.2.19/ext/spl/php_spl.h php-7.2.19_77883/ext/spl/php_spl.h
--- php-7.2.19/ext/spl/php_spl.h 2019-05-29 11:14:39.000000000 +0400
+++ php-7.2.19_77883/ext/spl/php_spl.h 2019-06-12 14:38:06.000000000 +0400
@@ -33,11 +33,11 @@
# elif defined(COMPILE_DL_SPL)
# define SPL_API __declspec(dllimport)
# else
# define SPL_API /* nothing */
# endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define SPL_API __attribute__ ((visibility("default")))
#else
# define SPL_API
#endif
diff -bBr -U 5 php-7.2.19/ext/xml/expat_compat.h php-7.2.19_77883/ext/xml/expat_compat.h
--- php-7.2.19/ext/xml/expat_compat.h 2019-05-29 11:14:39.000000000 +0400
+++ php-7.2.19_77883/ext/xml/expat_compat.h 2019-06-12 14:36:25.000000000 +0400
@@ -27,11 +27,11 @@
#include <php_config.h>
#endif
#ifdef PHP_WIN32
# define PHP_XML_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_XML_API __attribute__ ((visibility("default")))
#else
# define PHP_XML_API
#endif
diff -bBr -U 5 php-7.2.19/ext/zlib/zlib.c php-7.2.19_77883/ext/zlib/zlib.c
--- php-7.2.19/ext/zlib/zlib.c 2019-05-29 11:14:37.000000000 +0400
+++ php-7.2.19_77883/ext/zlib/zlib.c 2019-06-10 19:11:29.000000000 +0400
@@ -23,11 +23,11 @@
/* $Id$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-
+#define Z_FIXED 4
#include "php.h"
#include "SAPI.h"
#include "php_ini.h"
#include "ext/standard/info.h"
#include "ext/standard/file.h"
diff -bBr -U 5 php-7.2.19/main/php.h php-7.2.19_77883/main/php.h
--- php-7.2.19/main/php.h 2019-05-29 11:14:35.000000000 +0400
+++ php-7.2.19_77883/main/php.h 2019-06-12 14:31:35.000000000 +0400
@@ -68,11 +68,11 @@
# define PHPAPI __declspec(dllimport)
# endif
# define PHP_DIR_SEPARATOR '\\'
# define PHP_EOL "\r\n"
#else
-# if defined(__GNUC__) && __GNUC__ >= 4
+# if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHPAPI __attribute__ ((visibility("default")))
# else
# define PHPAPI
# endif
# define THREAD_LS
diff -bBr -U 5 php-7.2.19/main/SAPI.h php-7.2.19_77883/main/SAPI.h
--- php-7.2.19/main/SAPI.h 2019-05-29 11:14:35.000000000 +0400
+++ php-7.2.19_77883/main/SAPI.h 2019-06-12 14:40:17.000000000 +0400
@@ -38,11 +38,11 @@
# ifdef SAPI_EXPORTS
# define SAPI_API __declspec(dllexport)
# else
# define SAPI_API __declspec(dllimport)
# endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define SAPI_API __attribute__ ((visibility("default")))
#else
# define SAPI_API
#endif
diff -bBr -U 5 php-7.2.19/php.ini-production php-7.2.19_77883/php.ini-production
--- php-7.2.19/php.ini-production 2019-05-29 11:14:43.000000000 +0400
+++ php-7.2.19_77883/php.ini-production 2019-06-12 13:15:28.000000000 +0400
@@ -192,11 +192,11 @@
; used regardless of this directive.
; Default Value: On
; Development Value: Off
; Production Value: Off
; http://php.net/short-open-tag
-short_open_tag = Off
+short_open_tag = On
; The number of significant digits displayed in floating point numbers.
; http://php.net/precision
precision = 14
@@ -457,11 +457,13 @@
; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors)
; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
; Development Value: E_ALL
; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
; http://php.net/error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+; error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+; GW stop apache log filling with warnings about register_globals, undefined indexes etc
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_CORE_WARNING & ~E_WARNING & ~E_NOTICE
; This directive controls whether or not and where PHP will output errors,
; notices and warnings too. Error output is very useful during development, but
; it could be very dangerous in production environments. Depending on the code
; which is triggering the error, sensitive information could potentially leak
@@ -822,11 +824,11 @@
; http://php.net/upload-tmp-dir
;upload_tmp_dir =
; Maximum allowed size for uploaded files.
; http://php.net/upload-max-filesize
-upload_max_filesize = 2M
+upload_max_filesize = 128M
; Maximum number of files that can be uploaded via a single request
max_file_uploads = 20
;;;;;;;;;;;;;;;;;;
@@ -1934,5 +1935,11 @@
;openssl.capath=
; Local Variables:
; tab-width: 4
; End:
+
+; zend_extension_ts = ioncube_loader_lin_7.2_ts
+zend_extension = ioncube_loader_lin32_glibc2.3.4_7.2
+date.timezone=Indian/Mauritius
+include_path = ".:/usr/local/osprey/html/php-libs"
+
diff -bBr -U 5 php-7.2.19/sapi/cli/cli.h php-7.2.19_77883/sapi/cli/cli.h
--- php-7.2.19/sapi/cli/cli.h 2019-05-29 11:14:35.000000000 +0400
+++ php-7.2.19_77883/sapi/cli/cli.h 2019-06-12 14:40:27.000000000 +0400
@@ -21,11 +21,11 @@
#ifndef CLI_H
#define CLI_H
#ifdef PHP_WIN32
# define PHP_CLI_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_CLI_API __attribute__ ((visibility("default")))
#else
# define PHP_CLI_API
#endif
diff -bBr -U 5 php-7.2.19/sapi/phpdbg/phpdbg.h php-7.2.19_77883/sapi/phpdbg/phpdbg.h
--- php-7.2.19/sapi/phpdbg/phpdbg.h 2019-05-29 11:14:35.000000000 +0400
+++ php-7.2.19_77883/sapi/phpdbg/phpdbg.h 2019-06-12 14:40:36.000000000 +0400
@@ -21,11 +21,11 @@
#ifndef PHPDBG_H
#define PHPDBG_H
#ifdef PHP_WIN32
# define PHPDBG_API __declspec(dllexport)
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHPDBG_API __attribute__ ((visibility("default")))
#else
# define PHPDBG_API
#endif
diff -bBr -U 5 php-7.2.19/TSRM/TSRM.h php-7.2.19_77883/TSRM/TSRM.h
--- php-7.2.19/TSRM/TSRM.h 2019-05-29 11:14:35.000000000 +0400
+++ php-7.2.19_77883/TSRM/TSRM.h 2019-06-12 14:40:44.000000000 +0400
@@ -26,11 +26,11 @@
# ifdef TSRM_EXPORTS
# define TSRM_API __declspec(dllexport)
# else
# define TSRM_API __declspec(dllimport)
# endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define TSRM_API __attribute__ ((visibility("default")))
#else
# define TSRM_API
#endif
diff -bBr -U 5 php-7.2.19/Zend/zend_virtual_cwd.h php-7.2.19_77883/Zend/zend_virtual_cwd.h
--- php-7.2.19/Zend/zend_virtual_cwd.h 2019-05-29 11:14:43.000000000 +0400
+++ php-7.2.19_77883/Zend/zend_virtual_cwd.h 2019-06-12 14:35:02.000000000 +0400
@@ -109,11 +109,11 @@
# ifdef CWD_EXPORTS
# define CWD_API __declspec(dllexport)
# else
# define CWD_API __declspec(dllimport)
# endif
-#elif defined(__GNUC__) && __GNUC__ >= 4
+#elif defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define CWD_API __attribute__ ((visibility("default")))
#else
# define CWD_API
#endif
--- php-7.2.19/configure 2019-05-29 11:14:43.000000000 +0400
+++ php-7.2.19_77883/configure 2019-06-12 16:09:16.000000000 +0400
@@ -5431,11 +5431,11 @@
if ${ax_cv_check_cflags___fvisibility_hidden+:} false; then :
$as_echo_n "(cached) " >&6
else
ax_check_save_flags=$CFLAGS
- CFLAGS="$CFLAGS -fvisibility=hidden"
+ CFLAGS="$CFLAGS -fvisibility=hidden -D_HAS_VISIBILITY"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
@@ -5454,11 +5454,11 @@
CFLAGS=$ax_check_save_flags
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
$as_echo "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes; then :
- CFLAGS="$CFLAGS -fvisibility=hidden"
+ CFLAGS="$CFLAGS -fvisibility=hidden -D_HAS_VISIBILITY"
else
:
fi
@@ -43289,11 +43289,11 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
#else
# define PHP_IMAP_EXPORT
#endif
@@ -43356,11 +43356,11 @@
char utf8_to_mutf7_php(){ return utf8_to_mutf7(""); }
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
#else
# define PHP_IMAP_EXPORT
#endif
@@ -43423,11 +43423,11 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
#else
# define PHP_IMAP_EXPORT
#endif
@@ -43497,11 +43497,11 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#if defined(__GNUC__) && __GNUC__ >= 4
+#if defined(__GNUC__) && defined(_HAS_VISIBILITY)
# define PHP_IMAP_EXPORT __attribute__ ((visibility("default")))
#else
# define PHP_IMAP_EXPORT
#endif
|
Copyright © 2001-2024 The PHP Group