Commit Graph

112233 Commits

Author SHA1 Message Date
Peter Kokot
cf84bbf606 Merge branch 'PHP-7.4'
* PHP-7.4:
  Use PKG_CHECK_MODULES to detect the kerberos libraries
2019-04-20 15:18:14 +02:00
Hugh McMaster
aba72ebf15 Use PKG_CHECK_MODULES to detect the kerberos libraries 2019-04-20 15:13:24 +02:00
Peter Kokot
e869e2c807 Merge branch 'PHP-7.4'
* PHP-7.4:
  Update Git repository for Windows build tool kit
2019-04-19 21:11:39 +02:00
Peter Kokot
4ff2d96cc9 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Update Git repository for Windows build tool kit
2019-04-19 21:11:23 +02:00
Peter Kokot
d1bce98597 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update Git repository for Windows build tool kit
2019-04-19 21:11:01 +02:00
Peter Kokot
06fa35568e Update Git repository for Windows build tool kit 2019-04-19 21:09:46 +02:00
Gabriel Caruso
f13ad7836c Merge branch 'PHP-7.4'
* PHP-7.4:
  Fix typo in comments
2019-04-19 13:12:21 -03:00
Fabien Villepinte
baa9669392 Fix typo in comments 2019-04-19 13:11:50 -03:00
Kalle Sommer Nielsen
59f4490689 Remove HAVE_PCRE, as ext/pcre is always available 2019-04-19 15:18:31 +03:00
Dmitry Stogov
e04fbdab2f Keep EX(opline) in consistency when call engine and helper functions 2019-04-18 22:19:57 +03:00
Christoph M. Becker
5e482c72f9 Merge branch 'PHP-7.4'
* PHP-7.4:
  Use php-sdk-2.2.0beta5 on AppVeyor
2019-04-18 16:52:31 +02:00
Christoph M. Becker
994e20ec4f Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Use php-sdk-2.2.0beta5 on AppVeyor
2019-04-18 16:52:03 +02:00
Christoph M. Becker
fd4c42efab Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Use php-sdk-2.2.0beta5 on AppVeyor
2019-04-18 16:51:38 +02:00
Christoph M. Becker
a7ada30ac6 Use php-sdk-2.2.0beta5 on AppVeyor 2019-04-18 16:51:10 +02:00
Nikita Popov
648cc80987 Merge branch 'PHP-7.4' 2019-04-18 15:40:39 +02:00
Nikita Popov
3974180f92 Remove dead "props" member from date objects 2019-04-18 15:05:43 +02:00
Nikita Popov
32e5f8da4e Merge branch 'PHP-7.4' 2019-04-18 13:50:28 +02:00
Nikita Popov
dbaf9b7924 Revert "Fix zend_test interned strings loaded via dl()"
This reverts commit 7435ab3375.

It looks like we can't access EG(current_module) here in ZTS builds.
As the problematic asserts have now been disabled outside RC_DEBUG,
I'm just reverting this commit and leaving things as they were.
2019-04-18 13:49:42 +02:00
Dmitry Stogov
59d1360caa Merge branch 'PHP-7.4'
* PHP-7.4:
  Check assert only when RC_DEBUG is enabled
2019-04-18 14:27:18 +03:00
Dmitry Stogov
5ffa5217fc Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Check assert only when RC_DEBUG is enabled
2019-04-18 14:27:05 +03:00
Dmitry Stogov
3a04adce82 Check assert only when RC_DEBUG is enabled 2019-04-18 14:26:15 +03:00
Nikita Popov
d9ec9a919c Merge branch 'PHP-7.4' 2019-04-18 13:08:27 +02:00
Hugh McMaster
9f0c9b7ad6 Rename --enable-libxml to --with-libxml to meet naming guidelines 2019-04-18 13:08:02 +02:00
Hugh McMaster
cc930cdd75 Use PKG_CHECK_MODULES to detect libxml2 2019-04-18 13:04:54 +02:00
Hugh McMaster
29d1b7fd52 Remove support for --with-libxml-dir 2019-04-18 13:04:54 +02:00
Nikita Popov
2b7dd211a9 Merge branch 'PHP-7.4' 2019-04-18 12:59:12 +02:00
Nikita Popov
05c2e87e84 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-18 12:59:05 +02:00
Nikita Popov
b2f49c69b1 Add a dl() test to Travis
Compile the zend_test extension as shared and try loading it with dl()
to test for obvious issues. Doing this as a standalone call because this
is very specific to the CI setup.
2019-04-18 12:57:54 +02:00
Nikita Popov
3c44e29cfd Merge branch 'PHP-7.4' 2019-04-18 12:34:21 +02:00
Nikita Popov
7435ab3375 Fix zend_test interned strings loaded via dl() 2019-04-18 12:33:53 +02:00
Nikita Popov
358b81fc0e Merge branch 'PHP-7.4' 2019-04-18 12:14:54 +02:00
Nikita Popov
c6b5e2933c Merge branch 'PHP-7.3' into PHP-7.4 2019-04-18 12:14:49 +02:00
Nikita Popov
e9aa0337ab Fix more dl() interned string assertions 2019-04-18 12:14:07 +02:00
Nikita Popov
878e09c47c Merge branch 'PHP-7.4' 2019-04-18 12:10:21 +02:00
Nikita Popov
4aa78b67e7 Merge branch 'PHP-7.3' into PHP-7.4 2019-04-18 12:10:09 +02:00
Nikita Popov
a5b7f3bd81 Fix more dl() interned string assertions 2019-04-18 12:08:09 +02:00
Dmitry Stogov
28828ffccb Fixed JIT for recursive functions with type-hints 2019-04-18 12:32:31 +03:00
Nikita Popov
492a5d3ebe Merge branch 'PHP-7.4' 2019-04-18 10:11:51 +02:00
Nikita Popov
ed4c24274b Fix dl() module unloading in post deactivate
FOREACH_END_DEL() does not call the destructor by itself, we need to
explicitly call it. Due to the missing dtor call the functions were
not unregistered early, which resulted in later shutdown segfaults.
2019-04-18 10:10:15 +02:00
Dmitry Stogov
c78fc4971e Fixed access to uninitialized vaiable. 2019-04-18 10:48:04 +03:00
Dmitry Stogov
35ee6dc69f Don't initialize return value before calling user functions 2019-04-18 03:00:20 +03:00
Dmitry Stogov
f1767e23f4 Merge branch 'PHP-7.4'
* PHP-7.4:
  Don't initialize return value before calling user functions
2019-04-18 02:32:06 +03:00
Dmitry Stogov
38f9c8d93d Don't initialize return value before calling user functions 2019-04-18 02:31:12 +03:00
Dmitry Stogov
f9dbfcd6fa Merge branch 'PHP-7.4'
* PHP-7.4:
  Fixed compatibility with phpdbg
2019-04-18 01:34:13 +03:00
Dmitry Stogov
4c1a25ad5f Fixed compatibility with phpdbg 2019-04-18 01:33:56 +03:00
Peter Kokot
e564a13a5f Merge branch 'PHP-7.4'
* PHP-7.4:
  Join build makefiles together
2019-04-17 21:56:05 +02:00
Peter Kokot
02c1f3293e Join build makefiles together
Changes:
- Joins build/build.mk and build/build2.mk files together since there
  isn't any practical reason for having two different files with the
  current build system.
- Makefile is now more portable. All special syntaxes are omitted, for
  example, a conditional assignment operators `?=`. This makes buildconf
  more useful on Solaris make derivative, so there is no longer need to
  override make with gmake: `MAKE=gmake ./buildconf`.
- Suppressing autoconf and autoheader warnings is not needed anymore
  with current build system. Instead, the option `-Wall` has been used
  when running `./buildconf --debug` to get more useful debug info
  about current M4.
2019-04-17 21:52:58 +02:00
Dmitry Stogov
eeb0842e97 Merge branch 'PHP-7.4'
* PHP-7.4:
  It's safe to keep old string if it's stored not in SHM.
2019-04-17 22:09:07 +03:00
Dmitry Stogov
663056aa5f Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  It's safe to keep old string if it's stored not in SHM.
2019-04-17 22:08:55 +03:00
Dmitry Stogov
bfadd9fdaf It's safe to keep old string if it's stored not in SHM. 2019-04-17 21:57:17 +03:00