Michael Wallner
4a9d7c1f00
add NEWS entry; add simple test
2013-08-06 22:51:58 +02:00
Ralf Lang
8a7ea474a4
more precise condition
2013-08-06 22:51:58 +02:00
Ralf Lang
679fa1fc68
make this work in vc11 too
2013-08-06 22:51:58 +02:00
Ralf Lang
cb4c195f0b
Use int64_t and atoll() after discussion with johannes
2013-08-06 22:51:57 +02:00
Ralf Lang
de3527002a
ws
2013-08-06 22:51:57 +02:00
Ralf Lang
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
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones
ca0497bba2
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
Enable dtrace probes on linux as they are compatible with systemtap
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2013-08-05 15:46:54 -07:00
Christopher Jones
18f17818a6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
2013-08-05 15:40:56 -07:00
Christopher Jones
47d66a0b4e
NEWS for recent DTrace merges.
...
Remove redundant 'cp' during DTrace install.
2013-08-05 15:38:36 -07:00
Christopher Jones
6e89818f2f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
Enable dtrace probes on linux as they are compatible with systemtap
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
Conflicts:
Makefile.global
2013-08-05 15:35:46 -07:00
Christopher Jones
3bbe5931bc
Fixed bug #62691 (solaris sed has no -i switch)
...
Make 'make distclean' remove generated DTrace .h file
2013-08-05 15:18:12 -07:00
David Soria Parra
a5c524f1be
Enable dtrace probes on linux as they are compatible with systemtap
...
You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
2013-08-05 15:07:04 -07:00
Remi Collet
3c5e229212
Fixed bug #63706 : Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2013-08-05 14:52:12 -07:00
Christopher Jones
8fdf1ad32d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
Merge branch 'PHP-5.4'
2013-08-05 14:28:24 -07:00
Christopher Jones
b90b551228
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
Merge branch 'PHP-5.4'
Conflicts:
ext/mysqlnd/mysqlnd.c
2013-08-05 14:27:54 -07:00
Christopher Jones
85cc3b3240
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'PHP-5.5'
2013-08-05 14:25:43 -07:00
Christopher Jones
ec4019e8f6
Add an empty make command for DTrace .d files to stop an implicit
...
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)
2013-08-05 14:21:06 -07:00
Kalle Sommer Nielsen
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
Kalle Sommer Nielsen
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
Kalle Sommer Nielsen
85b7e9f046
Check for NULL ptr from get_stream() before passing it on to php_stream_cast()
2013-08-05 16:58:37 +02:00
Yasuo Ohgaki
8f74384947
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:27:19 +09:00
Yasuo Ohgaki
cb8d1fc7f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:24:07 +09:00
Yasuo Ohgaki
f718684a6c
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:23:15 +09:00
Stanislav Malyshev
7ca7ea85cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news about session fix
2013-08-04 20:07:00 -07:00
Stanislav Malyshev
e59143e896
add news about session fix
2013-08-04 20:06:48 -07:00
Stanislav Malyshev
eb20966f75
Merge branch 'PHP-5.5'
...
* PHP-5.5:
add news about session fix
fix crash, enable session_id and fix test
Strict session. Detect session id collision
Strict session
2013-08-04 20:05:17 -07:00
Stanislav Malyshev
169b78eb79
add news about session fix
2013-08-04 20:04:42 -07:00
Stanislav Malyshev
6f73a0c00f
Merge branch 'pr368' into PHP-5.5
...
* pr368:
fix crash, enable session_id and fix test
Strict session. Detect session id collision
Strict session
2013-08-04 20:00:28 -07:00
Stanislav Malyshev
c9c53e0763
Merge branch 'PHP-5.5'
...
* PHP-5.5:
First fixes for a 64bit compatible ftp extension
2013-08-04 19:36:29 -07:00
Stanislav Malyshev
7d3fa7d8b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
First fixes for a 64bit compatible ftp extension
2013-08-04 19:36:01 -07:00
Andreas Streichardt
a93a462dce
First fixes for a 64bit compatible ftp extension
2013-08-04 19:31:30 -07:00
Stanislav Malyshev
f20d28a6b1
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
...
The exists test should has covered this bug
Conflicts:
ext/pdo_dblib/dblib_driver.c
2013-08-04 19:19:37 -07:00
Stanislav Malyshev
1d6a136051
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix compiler warning, use longs for hashes
2013-08-04 18:05:18 -07:00
Stanislav Malyshev
e4f9619fad
fix compiler warning, use longs for hashes
2013-08-04 18:04:45 -07:00
Stanislav Malyshev
b80d73ce15
fix crash, enable session_id and fix test
2013-08-04 17:43:20 -07:00
Yasuo Ohgaki
82b0e8be99
Strict session. Detect session id collision
2013-08-04 16:36:53 -07:00
Yasuo Ohgaki
25e8fcc88f
Strict session
2013-08-04 16:36:45 -07:00
Stanislav Malyshev
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Stanislav Malyshev
c620a51a32
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix typo
2013-08-04 16:03:02 -07:00
Stanislav Malyshev
3626db6142
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix typo
2013-08-04 16:02:53 -07:00
Stanislav Malyshev
5f137d080a
fix typo
2013-08-04 16:02:27 -07:00
Rasmus Lerdorf
b48f7e0c79
Merge commit '626d96a'
...
* commit '626d96a':
This doesn't fail in 5.5 anymore
2013-08-03 12:15:28 -04:00
Rasmus Lerdorf
cadbec2fa0
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
Fix phar phpinfo test after markup changes
2013-08-03 12:15:16 -04:00
Rasmus Lerdorf
626d96ab6d
This doesn't fail in 5.5 anymore
2013-08-03 12:14:47 -04:00
Nikita Popov
43cbec0fa9
Fix phar phpinfo test after markup changes
2013-08-03 16:32:02 +02:00
Rasmus Lerdorf
9fa7e8932d
Merge commit 'a03f094'
...
* commit 'a03f094':
We shouldn't load any local ini files for these tests
2013-08-02 16:23:52 -04:00
Rasmus Lerdorf
f17f596b27
Merge commit 'a03f094' into PHP-5.5
...
* commit 'a03f094':
We shouldn't load any local ini files for these tests
2013-08-02 16:23:44 -04:00
