70c3a722e2
Increment version number, since this will be 5.5.6.
2013-10-23 12:36:27 -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
569eddce0f
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-04 19:22:28 -07:00
1b60c189ad
Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-04 19:15:52 -07:00
44dbe6a815
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
keep previous test to avoid any behavior change
2013-04-02 16:31:45 +02:00
731a5c5104
keep previous test to avoid any behavior change
2013-04-02 16:31:36 +02:00
ce89bc8743
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix comment
Fixed Bug #64565 copy doesn't report failure on partial copy
2013-04-02 16:24:14 +02:00
8e8a75444c
fix comment
2013-04-02 16:24:00 +02:00
6b4148bc97
Fixed Bug #64565 copy doesn't report failure on partial copy
...
_php_stream_copy_to_stream_ex, when mmap is possible, doesn't check
if actually written bytes match read bytes.
Fix this (paranoid check) to be consistent with non mmap mode
Seems hard to add a unit test, as this rely on a full filesystem.
2013-04-02 16:18:26 +02:00
46ee57f2d7
This will PHP 5.3.25
2013-03-28 15:05:46 +01:00
f982aaafa7
will be 5.4.15
2013-03-27 14:00:12 -07:00
d0aa831614
versions no longer supported, no need to check
2013-03-27 07:15:23 +01:00
c542e969f2
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix typos
2013-03-19 15:11:48 +01:00
Adam Harvey