Commit Graph

91222 Commits

Author SHA1 Message Date
Bob Weinand
a919fe8606 Do not display EXT_TYPE_UNUSED in phpdbg opcodes 2015-07-06 18:05:03 +02:00
Bob Weinand
b3ab7c13dc Run debug build with opcache on travis 2015-07-06 17:41:24 +02:00
Dmitry Stogov
001ecd3198 Simplify TMP var number decoding (without HashTable) 2015-07-06 17:56:48 +03:00
Dmitry Stogov
436b01e379 Avoid dangerous optimization 2015-07-06 16:52:38 +03:00
Dmitry Stogov
1a9f4f90da Fixed JMPZNZ instruction printing 2015-07-06 16:30:50 +03:00
Côme Bernigaud
da6e286dbb Merge branch 'PHP-5.6'
* PHP-5.6:
  Attempt at falling back on ldap_find_control for Mac OS
2015-07-06 14:56:20 +02:00
Côme Bernigaud
022068342b Attempt at falling back on ldap_find_control for Mac OS 2015-07-06 14:54:04 +02:00
Côme Bernigaud
a09dcb0e13 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated README, added test to create LDAP base if missing and ease tests
2015-07-06 14:28:01 +02:00
Anatol Belski
535b2cc02b update NEWS about #69900
backport for 5.6 to go
2015-07-06 14:27:17 +02:00
Côme Bernigaud
42f7e4c044 Updated README, added test to create LDAP base if missing and ease tests 2015-07-06 14:26:49 +02:00
Dmitry Stogov
2f7b178fac Fixed test (shift operators throw Error) 2015-07-06 12:28:14 +03:00
Dmitry Stogov
7a1a499377 Fixed return value 2015-07-06 11:25:19 +03:00
Xinchen Hui
5e7fd530ce Merge branch 'signed_char' of https://github.com/antonblanchard/php-src 2015-07-06 15:36:55 +08:00
Xinchen Hui
84e07b08bd Reorder the conditions 2015-07-06 15:24:51 +08:00
Xinchen Hui
ce550cefde Fixed segfault while with generating ext info 2015-07-06 15:22:40 +08:00
Anton Blanchard
275009d0bd http parser code assumes char is signed
A char can be either signed or unsigned, and on PowerPC and ARM it is
unsigned. The following code will always be false on these architectures:

        if (c == -1) goto error;
2015-07-06 10:13:00 +10:00
Anatol Belski
a97f764472 bring back the division by zero warning 2015-07-05 20:18:17 +02:00
Stanislav Malyshev
b9d3540304 Merge branch 'pull-request/1368'
* pull-request/1368:
  moved function warning test to money_format_error.phpt file
2015-07-05 01:24:35 -07:00
Stanislav Malyshev
013d1296d6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Cleaned white spaces in PHP_INI definition of phar
2015-07-05 01:10:29 -07:00
Dominic
b27bcd90b3 Cleaned white spaces in PHP_INI definition of phar
Removes unnecessary white spaces.
2015-07-05 01:10:22 -07:00
Stanislav Malyshev
9b6c3d19c5 Merge branch 'pull-request/1351'
* pull-request/1351:
  Cleaned white spaces in PHP_INI definition of phar
2015-07-05 01:04:22 -07:00
Stanislav Malyshev
64eb8338b1 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix typo, see #68476
2015-07-05 01:01:27 -07:00
Stanislav Malyshev
04ca04f830 Merge branch 'pull-request/1324' into PHP-5.6
* pull-request/1324:
  fix typo, see #68476
2015-07-05 01:01:00 -07:00
Stanislav Malyshev
3e88d610e5 Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-04 23:47:48 -07:00
Stanislav Malyshev
452d30cf7d Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-04 21:01:50 -07:00
Bob Weinand
56b6e0dd14 Fix use after free with opcache (interned strings) 2015-07-05 02:00:52 +02:00
Kalle Sommer Nielsen
12b79fcb05 This macro check is not needed (Anatol) 2015-07-04 21:21:15 +02:00
Kalle Sommer Nielsen
ce2cd89258 Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c) 2015-07-04 18:55:22 +02:00
Xinchen Hui
550bbf8f46 Fixed bug #69983 (get_browser fails with user agent of null) 2015-07-04 11:05:50 +08:00
Aaron Piotrowski
1a0ddf988c Switch code on thrown Errors to 0, update related tests 2015-07-03 17:53:42 -05:00
Aaron Piotrowski
fbcc823952 Remove E_EXCEPTION 2015-07-03 17:53:42 -05:00
Aaron Piotrowski
02623ddb82 Switch macro with __VA_ARGS__ to function 2015-07-03 17:53:41 -05:00
Aaron Piotrowski
22c38b2ef5 Remove need to pass error level 2015-07-03 17:53:41 -05:00
Aaron Piotrowski
5a99c07ecc Enable throwing custom exceptions from errors 2015-07-03 17:53:40 -05:00
Nikita Popov
866bd89b1d Always report object leaks
Previously cycles were excluded from leak reports, however the
situation here has improved a lot in the meantime and we can
report all leaks.
2015-07-03 19:33:34 +02:00
Nikita Popov
3c33854e7c Don't leak generator cycle in ReflectionGenerator test
This is tracked by bug #69989.
2015-07-03 19:33:28 +02:00
Aaron Piotrowski
ed1b64877d Switch position of ce in exception ce variable names 2015-07-03 09:45:03 -05:00
Aaron Piotrowski
a812a74c2e Change zend_exception_get_default() to zend_exception_ce 2015-07-03 09:44:48 -05:00
Aaron Piotrowski
f9e9d3a437 Cleanup exception ce API
Removed recently added functions to get Error ce's and marked the old functions
fetching default_exception_ce and error_exception_ce as deprecated.
2015-07-03 09:44:30 -05:00
Anatol Belski
9adfb053e6 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix backport mistake
2015-07-03 16:22:01 +02:00
Anatol Belski
b281211979 fix backport mistake
in 5.6 it has to be explicitly copied to avoid double free
2015-07-03 16:21:02 +02:00
Christoph M. Becker
e75cf6b7e4 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed fix #69975 wrt. ODBCVER < 0x0300
2015-07-03 13:32:05 +02:00
Christoph M. Becker
344ff5dd4c fixed fix #69975 wrt. ODBCVER < 0x0300 2015-07-03 13:30:39 +02:00
Anatol Belski
02df0cb02b improve info about the applink 2015-07-03 12:45:59 +02:00
Anatol Belski
9d9f372df6 added openssl applink shim note to UPGRADING.INTERNALS 2015-07-03 12:40:54 +02:00
Anatol Belski
274edb4c6f add missing item in the content table 2015-07-03 12:40:53 +02:00
Anatol Belski
54e19fe7c3 Merge branch 'PHP-5.6'
* PHP-5.6:
  backport c01943bffc into 5.6
2015-07-03 11:17:16 +02:00
Anatol Belski
d870683d6b backport c01943bffc into 5.6 2015-07-03 11:16:02 +02:00
Anatol Belski
c01943bffc fix improper behavior
openssl_spki_export() is documented to return string, but it's
obviously not achieved writing it to stdout :)
2015-07-03 10:15:52 +02:00
Anatol Belski
3d7343f609 integrate the applink shim in the other bins 2015-07-03 07:11:14 +02:00