Julien Pauli
3eb2b1ac40
Updated release process
2013-12-13 13:16:54 +01:00
Dmitry Stogov
af66b20781
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Use zend_error_noreturn here
OCI8 build change: Fix source variable definition for C89 compatibility
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
Fixed bug #65784 (Segfault with finally).
2013-12-13 11:17:50 +04:00
Dmitry Stogov
e6dbf0eeff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Use zend_error_noreturn here
Add Tests for #65784 in 5.5
Disallowed JMP into a finally block.
Update NEWS for 5.5.7 release
2013-12-13 11:16:17 +04:00
Xinchen Hui
6f95a07c41
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-13 11:37:43 +08:00
Xinchen Hui
ef73f85079
Use zend_error_noreturn here
2013-12-13 10:56:35 +08:00
Christopher Jones
bc748ba38c
OCI8 build change: Fix source variable definition for C89 compatibility
2013-12-12 15:22:55 -08:00
Xinchen Hui
c9d00a23ae
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
2013-12-13 01:48:17 +08:00
Xinchen Hui
ab12ccd16a
Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
2013-12-13 01:46:28 +08:00
Xinchen Hui
dde552f2ee
Add Tests for #65784 in 5.5
2013-12-13 01:45:45 +08:00
Xinchen Hui
54213b462d
Disallowed JMP into a finally block.
2013-12-13 01:44:54 +08:00
Julien Pauli
3248b3c4d8
Update NEWS for 5.5.7 release
2013-12-12 17:16:13 +01:00
Xinchen Hui
794a888a48
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:16:08 +08:00
Dmitry Stogov
711d8c2c7b
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
fix test
2013-12-12 16:46:49 +04:00
Dmitry Stogov
3bddcc13b5
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
fix test
2013-12-12 16:46:37 +04:00
Michael Wallner
1dfbe99ce4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test
2013-12-12 12:09:54 +01:00
Michael Wallner
8ee6fe9856
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test
2013-12-12 12:09:34 +01:00
Michael Wallner
c59f3184a3
fix test
2013-12-12 12:08:50 +01:00
Dmitry Stogov
47f41385e1
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 14:00:03 +04:00
Dmitry Stogov
463dbc3490
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
...
* 'PHP-5.6' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:51 +04:00
Dmitry Stogov
9850d57fd9
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests
Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:23 +04:00
Anatol Belski
39a2dcdeac
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:21 +01:00
Dmitry Stogov
0344e6a429
Fixed tests
2013-12-12 13:35:37 +04:00
Anatol Belski
da62fd5ed8
Fixed bug #65486 mysqli_poll() is broken on Win x64
...
While this issue is visible in mysqli_poll() functions, the cause
lays deeper in the stream to socket casting API. On Win x64 the
SOCKET datatype is a 64 or 32 bit unsigned, while on Linux/Unix-like
it's 32 bit signed integer. The game of casting 32 bit var to/from
64 bit pointer back and forth is the best way to break it.
Further more, while socket and file descriptors are always integers
on Linux, those are different things using different APIs on Windows.
Even though using integer instead of SOCKET might work on Windows, this
issue might need to be revamped more carefully later. By this time
this patch is tested well with phpt and apps and shows no regressions,
neither in mysqli_poll() nor in any other parts.
2013-12-12 10:17:01 +01:00
Dmitry Stogov
1886292ec9
Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:02:50 +04:00
Anatol Belski
6f739318fd
fix dir separator in cve-2013-6420 test
2013-12-11 13:31:29 +01:00
Stanislav Malyshev
8650bbc8dc
5.3.29-dev
2013-12-10 11:32:11 -08:00
Stanislav Malyshev
c1224573c7
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:03:49 -08:00
Bob Weinand
baceff6ad4
Tiny whitespace fix in makefile (aligning with other "Installing" messages)
2013-12-09 19:58:19 +01:00
Bob Weinand
2fa3479df5
Added conditional opline num support
2013-12-09 13:25:00 +01:00
Felipe Pena
bba73628e6
- Fix compiler warning
2013-12-09 09:46:33 -02:00
Bob Weinand
97604918ba
Fixed segfault (removed superfluous NUL-byte insertion)
2013-12-09 12:23:44 +01:00
krakjoe
af979393fc
resolve all warnings
2013-12-09 10:15:16 +00:00
krakjoe
058b59bb58
update cl
2013-12-09 09:49:50 +00:00
krakjoe
cbaf610ee4
fix test
2013-12-09 09:43:26 +00:00
krakjoe
64194ef652
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2013-12-09 09:35:54 +00:00
krakjoe
12d071fa7c
remove zend extension
2013-12-09 09:33:32 +00:00
Bob Weinand
b35f6ee723
Pssst, compiler!
2013-12-08 22:11:50 +01:00
Bob Weinand
71ae30f1b8
WS
2013-12-08 21:58:01 +01:00
Bob Weinand
e3bf7ad5b5
Renumbered frames in backtrace for internal functions
2013-12-08 21:43:19 +01:00
Felipe Pena
cd3b070d7e
- Added variadic support to prototype dumping
2013-12-08 18:04:39 -02:00
Felipe Pena
b655a0bc7e
- Fix argname printing order
2013-12-08 17:52:14 -02:00
Felipe Pena
50e8a47c90
- Added argument name to backtrace dump
2013-12-08 17:37:35 -02:00
Felipe Pena
508772840e
- CS
2013-12-08 16:48:20 -02:00
Felipe Pena
1fc10b5706
- Splitting prototype dumping code
2013-12-08 16:47:53 -02:00
Felipe Pena
e5a2d2efbd
- Change phpdbg_dump_backtrace prototype
2013-12-08 16:33:19 -02:00
Felipe Pena
3ec948bca3
- Fixed build
2013-12-08 16:30:52 -02:00
Felipe Pena
bae424dbb7
- Moved frame related code to phpdbg_frame.c
2013-12-08 16:29:15 -02:00
Felipe Pena
c987e46b6f
- CS + ws
2013-12-08 16:07:49 -02:00
Adam Harvey
d40a5a2797
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Switch to using freetype-config for freetype detection.
2013-12-07 19:41:44 -08:00
Bob Weinand
324291ebf2
Added one more test for constant scalar expressions
2013-12-11 19:17:07 +01:00
