summaryrefslogtreecommitdiff
path: root/TSRM
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.4'Christoph M. Becker2019-07-131-1/+1
|\ | | | | | | | | * PHP-7.4: Fix #78282: atime and mtime mismatch
| * Fix #78282: atime and mtime mismatchChristoph M. Becker2019-07-131-1/+1
| | | | | | | | | | | | The fix for bug #78241 assumed that `time_t` would always be 64bit, but actually is 32bit for x86. We therefore enforce 64bit arithmetic to avoid wrapping.
* | Merge branch 'PHP-7.4'Peter Kokot2019-07-131-69/+0
|\ \ | |/ | | | | | | * PHP-7.4: Remove tsrm_config_common.h
| * Remove tsrm_config_common.hPeter Kokot2019-07-131-69/+0
| | | | | | | | | | | | | | - Checks and defines are not relevant for files that include it anymore - Some code is not used anymore - Defines are a bit duplicated in zend_portability.h and TSRM.h file - MAXPATHLEN defs moved to zend_virtual_cwd.h
* | Merge branch 'PHP-7.4'Nikita Popov2019-07-123-72/+1
|\ \ | |/
| * Remove unused tsrm_strtok_r() functionNikita Popov2019-07-123-72/+1
| | | | | | | | | | There is also a php_strtok_r() function, which is actually used, but nothing uses the tsrm_strtok_r() variant...
* | Merge branch 'PHP-7.4'Peter Kokot2019-07-103-16/+2
|\ \ | |/ | | | | | | * PHP-7.4: Remove TSRM/tsrm_config.w32.h
| * Remove TSRM/tsrm_config.w32.hPeter Kokot2019-07-103-16/+2
| | | | | | | | | | | | | | The tsrm_config.w32.h file is a simple wrapper for already defined symbols and includes elsewhere. Closes GH-4383
* | Merge branch 'PHP-7.4'Peter Kokot2019-07-051-28/+0
|\ \ | |/ | | | | | | * PHP-7.4: Remove PTHREADS_ASSIGN_VARS
| * Remove PTHREADS_ASSIGN_VARSPeter Kokot2019-07-051-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies TSRM build steps a bit and avoids doing unnecessary steps: - The `PTHREADS_CHECK_COMPILE` can called inside the for loops only since this is only where the `$pthreads_checked` variable is used. - Assigning variables can be then done only in the configure.ac once. - use `m4_include()` instead of the `sinclude()` in the middle of the build steps. - The `$threads_result` variable is not used in the code or in extensions.
* | Merge branch 'PHP-7.4'Christoph M. Becker2019-07-031-1/+1
|\ \ | |/ | | | | | | * PHP-7.4: Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit
| * Merge branch 'PHP-7.3' into PHP-7.4Christoph M. Becker2019-07-031-1/+1
| |\ | | | | | | | | | | | | * PHP-7.3: Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit
| | * Merge branch 'PHP-7.2' into PHP-7.3Christoph M. Becker2019-07-031-1/+1
| | |\ | | | | | | | | | | | | | | | | * PHP-7.2: Fix #78241: touch() does not handle dates after 2038 in PHP 64-bit
| | | * Fix #78241: touch() does not handle dates after 2038 in PHP 64-bitChristoph M. Becker2019-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `time_t` defaults to `_time64` (which is 64bit signed) even on x86, but `Int32x32To64()` truncates it to signed 32bit. We replace the macro with the "manual" calculation.
| * | | Remove some old BeOS artefactsPeter Kokot2019-07-021-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - checking for beos systems is no longer relevant in configure.ac - usage of undefined constant BETHREADS removed. Closes GH-4346
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-07-011-8/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Remove TSRM_BASIC_CHECKS
| * | | Remove TSRM_BASIC_CHECKSPeter Kokot2019-07-011-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This macro is not needed anymore. The AC_PROG_CC is done in the main configure.ac file and the ranlib check is done by the bundled libtool macros. Closes GH-4339
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-06-301-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Sync functions checks
| * | | Sync functions checksPeter Kokot2019-06-301-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused checks: - mbsinit check removed, HAVE_MBSINIT removed (not used in php-src) - mempcpy check removed, HAVE_MEMPCPY removed (not used in php-src anymore since 560ed89bfbb56526251e9bd2fbcb27e5932641d8 which uses PHP's own implementation) - strpncpy check removed, added via a8c9e893b6911c785f698d724b2ff61e7aebb737 and not used. - setpgid check removed since HAVE_SETPGID is not used Moved to a central configure.ac: - fpclass - mbrlen moved to configure.ac (since the HAVE_MBRLEN is used accross the php-src) - sigprocmask - getcwd - getwd - glob - strfmon - nice Duplicated checks removed: - gethostname - getlogin - getpwuid_r - socketpair - mprotect check simplified
* | | | Merge branch 'PHP-7.4'Joe Watkins2019-06-282-79/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: implement tsrm_is_shutdown API
| * | | implement tsrm_is_shutdown APIJoe Watkins2019-06-282-79/+44
| | | |
* | | | Attempt to fix JIT on Mac OSX ZTS buildDmitry Stogov2019-06-171-1/+4
| | | |
* | | | Merge branch 'PHP-7.4'Joe Watkins2019-06-111-7/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: This reverts 0e5d4ea55554872fe72e5d984b73fc21abc561fe to fix the build on MacOSX
| * | | This reverts 0e5d4ea55554872fe72e5d984b73fc21abc561fe to fix the build on MacOSXJoe Watkins2019-06-111-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | On Mac thread_local and __thread are not ABI compatible, in addition, thread_local comes with additional overhead, __thread seems to be the most suitable linkage to use regardless of c++/c
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-06-041-6/+0
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.3' into PHP-7.4Nikita Popov2019-06-041-6/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'PHP-7.2' into PHP-7.3Nikita Popov2019-06-041-6/+0
| | |\ \ | | | |/
| | | * Reload tsrmls_id in release builds as wellNikita Popov2019-06-041-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | If TSRM is shut down and started again (something that phpdbg does), then tsrmls_id needs to be reloaded everywhere. As tsrmls_id update is a rare operation, doing that shouldn't be a problem.
| | | * Sync leading and final newlines in source code filesPeter Kokot2018-10-143-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| | | * Trim trailing whitespace in source code filesPeter Kokot2018-10-134-14/+14
| | | |
| | | * year++Xinchen Hui2018-01-022-2/+2
| | | |
| | * | Future-proof email addressesZeev Suraski2018-11-012-2/+2
| | | |
| | * | Sync leading and final newlines in source code filesPeter Kokot2018-10-142-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds missing newlines, trims multiple redundant final newlines into a single one, and trims redundant leading newlines. According to POSIX, a line is a sequence of zero or more non-' <newline>' characters plus a terminating '<newline>' character. [1] Files should normally have at least one final newline character. C89 [2] and later standards [3] mention a final newline: "A source file that is not empty shall end in a new-line character, which shall not be immediately preceded by a backslash character." Although it is not mandatory for all files to have a final newline fixed, a more consistent and homogeneous approach brings less of commit differences issues and a better development experience in certain text editors and IDEs. [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 [2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2 [3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
| | * | Trim trailing whitespace in source code filesPeter Kokot2018-10-132-7/+7
| | | |
* | | | Merge branch 'PHP-7.4'Christoph M. Becker2019-05-291-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Remove unused variable
| * | | Remove unused variableGabriel Caruso2019-05-291-1/+0
| | | |
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-05-122-13/+22
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Normalize comments in *nix build system m4 files
| * | | Normalize comments in *nix build system m4 filesPeter Kokot2019-05-122-20/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normalization include: - Use dnl for everything that can be ommitted when configure is built in favor of the shell comment character # which is visible in the output. - Line length normalized to 80 columns - Dots for most of the one line sentences - Macro definitions include similar pattern header comments now
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-04-292-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Remove TSRM configuration header
| * | | Remove TSRM configuration headerPeter Kokot2019-04-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | TSRM configuration header file was once created by separate autoconf build system for TSRM and is with the current code not directly needed like this anymore.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-04-291-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Remove unused TSRM/readdir.h header
| * | | Remove unused TSRM/readdir.h headerPeter Kokot2019-04-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was once part of TSRM but then got refactored into the windows implementation win32/readdir.h directly. Instead of including such files directly code should use zend_virtual_cwd.h which is already part of the php.h file.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-04-232-201/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Move Autoconf Archive macros to a common m4 dir
| * | | Move Autoconf Archive macros to a common m4 dirPeter Kokot2019-04-232-202/+0
| | | | | | | | | | | | | | | | | | | | In PHP the build dir is used as a directory for external macros including Autoconf Archive macros.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-04-231-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Remove sinclude from tsrm.m4
| * | | Remove sinclude from tsrm.m4Peter Kokot2019-04-231-2/+0
| | | | | | | | | | | | | | | | | | | | This was once part of a standalone TSRM build and is not used in current build system anymore.
* | | | Merge branch 'PHP-7.4'Nikita Popov2019-04-112-8/+8
|\ \ \ \ | |/ / /
| * | | Make tsrm_env_lock() voidNikita Popov2019-04-112-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | We're not checking the return value and the NTS version of this generates warnings. If we want to handle lock failures, we should do a hard abort inside tsrm_env_lock() itself.
* | | | Merge branch 'PHP-7.4'Peter Kokot2019-04-071-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-7.4: Remove HAVE_SIGNAL_H
| * | | Remove HAVE_SIGNAL_HPeter Kokot2019-04-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `<signal.h>` header file is part of the standard C89 headers [1] and on current systems can be included unconditionally. Since file requires at least C89 or greater, the `HAVE_SIGNAL_H` symbol defined by Autoconf in Zend.m4 [2] can be ommitted and simplifed. The bundled libmagic (file) also ommits the usage of HAVE_SIGNAL_H since 5.35 however current version in PHP is very modified 5.34 version and will be refactored separately. Check for HAVE_SIGNAL_H is therefore still done in the configure.ac. Refs: [1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2 [2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4