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
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
Anatol Belski
59444347d1
integrate the openssl applink shim
...
This fixes ext/openssl/tests/openssl_spki_export.phpt failing
with the no OPENSSL_Applink error. Applink is also an interesting
technique documented in the OpenSSL FAQ
https://www.openssl.org/support/faq.html#PROG2
which allows under circumstances using different OpenSSL binaries
than those a program was linked with.
2015-07-03 07:11:13 +02:00
Xinchen Hui
e8f992c163
Catch the specifical exception
2015-07-03 11:18:53 +08:00
Christoph M. Becker
21029da71c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Added more tests to improve function coverage
2015-07-03 03:12:09 +02:00
Edgar R. Sandi
48d71af7ed
Added more tests to improve function coverage
2015-07-03 03:02:40 +02:00
Aaron Piotrowski
68baa539dc
Allow integer default for float type
2015-07-02 18:07:24 -05:00
Christoph M. Becker
2768bdbce0
updated NEWS
2015-07-03 00:29:44 +02:00
Christoph M. Becker
caa539b481
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
Fix #69975 : PHP segfaults when accessing nvarchar(max) defined columns
2015-07-03 00:25:03 +02:00
Christoph M. Becker
616661e0f8
updated NEWS
2015-07-03 00:23:44 +02:00
Christoph M. Becker
16db4d1462
Fix #69975 : PHP segfaults when accessing nvarchar(max) defined columns
...
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.
The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
2015-07-03 00:15:47 +02:00
Bob Weinand
57881e878d
Update NEWS for bug #69957
2015-07-02 21:19:26 +02:00
Niklas Keller
5f72d94a8b
Correct type hint name for booleans in method signatures
2015-07-02 21:14:30 +02:00
Bob Weinand
6ff72467dc
XFAILED tests are not "You may have found a problem in PHP"
2015-07-02 20:49:30 +02:00
Bob Weinand
94722e12cf
Introduce ArithmeticError
2015-07-02 20:47:44 +02:00