aba76f09fa
Revert accidented committed php_version.h
2013-12-27 14:10:55 +08:00
2938329ce1
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
And also fixed the bug: arguments are altered after some calls
2013-12-27 14:04:59 +08:00
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
a48d82d238
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61645 (fopen and O_NONBLOCK)
fix possibly uninitialized value
2013-12-06 10:33:10 +01:00
b5f5bff965
Fixed bug #61645 (fopen and O_NONBLOCK)
...
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
2013-12-06 10:29:24 +01:00
00a7b1ff7f
Fix php_module_startup() when loading more than one additional module
...
Dereferencing addition_modules within php_module_startup would
point to a vector entirely on the stack (which is of course, wrong).
Use a specialized helper to keep BC with the current php_module_startup()
calling semantics.
Fixes 63159
Thanks to @a-j-k
2013-12-03 18:20:19 -08:00
e9c6a1cfd2
5.5.8-dev now
2013-11-27 09:34:40 +01:00
63f3ff7b5f
5.4.24-dev now
2013-11-27 00:13:45 -08:00
1984919ddc
5.5.7 now
2013-11-12 18:20:09 +01:00
4ded6ee971
5.4.23-dev
2013-10-29 18:11:02 -07:00
70c3a722e2
Increment version number, since this will be 5.5.6.
2013-10-23 12:36:27 -07:00
b2f8f35a88
5.4.22-dev now
2013-10-01 22:25:56 -07:00
a34b141e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:11 +02:00
9bfd55cda3
fix a very rare case of use of uninitialized value combined with a
...
memleak
2013-09-18 11:10:55 +02:00
0e10f26e27
5.5.5 now
2013-09-04 11:22:23 +02:00
7beef74a82
5.4.21 now
2013-09-03 13:38:15 -07:00
53d9643431
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
bump version
Update NEWS
Conflicts:
configure.in
main/php_version.h
2013-08-19 23:23:21 -07:00
d487f5e9ac
bump version
2013-08-19 23:19:51 -07:00
bf0c6f2858
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
new for fix #65225
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:21:14 -07:00
98d29d20a1
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:18:33 -07:00
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
f3d18add08
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-14 11:44:37 +08:00
f4dc2240a0
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
2013-08-14 11:42:39 +08:00
2c23004a1e
next is 5.5.2
2013-07-21 21:16:39 -07:00
1dc7d0da08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:39:53 +02:00
2b9d42433f
Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:37:39 +02:00
b9e3f737d9
5.4.19 is next
2013-07-17 13:51:15 -07:00
e7a4cf8d7e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix buffer overrun
2013-07-15 17:35:29 +02:00
9561e598a0
fix buffer overrun
2013-07-15 17:34:36 +02:00
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
f5b9d87fb9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:31:22 +02:00
29ac511b8a
fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:00:47 +02:00
d01ca1342c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:36 -03:00
6ba93a4bae
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:26 -03:00
83fc53acb9
Bump version
2013-06-19 22:11:52 +02:00
dda3f404ec
5.4.18 next
2013-06-18 22:58:11 -07:00
6f594514b0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:55:12 +02:00
02f552ceca
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:54:32 +02:00
6238dd6f32
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:51:54 +02:00
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
4cb25d25f1
This will be PHP 5.3.27
2013-05-22 17:13:17 +02:00
c53058763a
5.4.17 is next
2013-05-21 23:36:28 -07:00
fda25c7ea6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64853Use of no longer available ini directives causes crash on TS build
2013-05-16 08:43:07 +02:00
d82704b677
Fixed bug #64853Use of no longer available ini directives causes crash on TS build
...
The fatal error for removed ini options is thrown before the executor
init, so ensure the relevant variables are initialized.
2013-05-16 08:40:56 +02:00
63434524f8
PHP 5.3.26 this will be
2013-04-25 18:02:53 +02:00
a58a279d7b
5.4.16-dev
2013-04-24 10:15:35 -07:00
c3a57fff5e
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-04 19:23:22 -07:00
Xinchen Hui