4fbce676bd
Merge branch 'pull-request/381'
...
* pull-request/381:
Fixed #65225 : PHP_BINARY incorrectly set
2013-08-18 14:20:46 -07:00
3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -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
9d4e5b0dba
Fix to file uploads >2G with size overflow
...
Represent the file size as string when the total size would overflow
LONG_MAX. Otherwise while file itself were uploaded, the size would
be shown wrong. This mostly applies to systems with 32 bit long.
2013-08-14 18:59:46 +02:00
b6fa0b40f7
Merge branch 'PHP-5.5'
2013-08-14 11:44:53 +08: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
acea91b18c
Fixes to unified stdint usage
...
This recalls 14caf174ff
2013-08-12 13:39:17 +02:00
8a7ea474a4
more precise condition
2013-08-06 22:51:58 +02:00
679fa1fc68
make this work in vc11 too
2013-08-06 22:51:58 +02:00
cb4c195f0b
Use int64_t and atoll() after discussion with johannes
2013-08-06 22:51:57 +02:00
de3527002a
ws
2013-08-06 22:51:57 +02:00
84f9213e00
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
...
above 2G.
This is essentially the same as the patch
"uploads_larger_than_2g_HEAD_v2 (last revision 2012-03-26 03:59 UTC) by
jason at infininull dot com)" but using off_t instead of signed long
(originally: uint)
I tested this on 64bit linux and succeeded uploading a file of 4.8 G.
The File did not get corrupted or truncated in any way.
I did not yet test this under windows or 32 bit linux
Note that there are still limitations:
* Did not test for files > 8 G
* php does not yet reject absurdly high values
* Still limited by underlying file system specific limits and free space
* in upload
* tmp dir and destination dir
2013-08-06 22:51:57 +02:00
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
2c23004a1e
next is 5.5.2
2013-07-21 21:16:39 -07:00
85bbc8fa9d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:40:15 +02: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
fb91fc6e2c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix buffer overrun
2013-07-15 17:35:52 +02: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
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
638f1c3b79
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:32:13 +02: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
b980e4fedc
Fixed #65225 : PHP_BINARY incorrectly set
2013-07-09 15:05:10 +02:00
5c71d4d785
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:48 -03: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
55656d616c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:56:04 +02: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
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07: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
2933f77e39
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated NEWS
Fixed bug #64853Use of no longer available ini directives causes crash on TS build
2013-05-16 08:45:02 +02: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
Stanislav Malyshev