clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 23:36:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,863 Commits 494 Branches 1,367 Tags 809 MiB
6d66d613f6
Commit Graph

75863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki
2df95b1354 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed possible buffer overflow under Windows. Note: Not a security fix.
 2013-08-11 06:43:37 +09:00
Yasuo Ohgaki
0ad81ac18a Fixed possible buffer overflow under Windows. Note: Not a security fix. 2013-08-11 06:43:01 +09:00
Yasuo Ohgaki
771b06f585 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
 2013-08-10 18:30:05 +09:00
Yasuo Ohgaki
9d95a1a7d1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
 2013-08-10 18:29:29 +09:00
Yasuo Ohgaki
e9b128c1bf Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime 2013-08-10 18:29:13 +09:00
Yasuo Ohgaki
6941ce3583 Implemented Request #20421 (session_abort() and session_reset() function 2013-08-10 16:57:56 +09:00
Yasuo Ohgaki
54a42f0d0c Implemented Request #11100 (session_gc() function). 2013-08-10 15:20:24 +09:00
Yasuo Ohgaki
f2b5725115 Remove compile warning of commit 554021d21e 2013-08-10 14:35:30 +09:00
Yasuo Ohgaki
554021d21e Implemented Bug #17860 Suggestion: auto detect whether session changed 2013-08-10 13:56:32 +09:00
Yasuo Ohgaki
678ec30655 Implement Bug #54649 Create session_serializer_name() 2013-08-10 09:26:10 +09:00
Michael Wallner
3419ee9547 bison upgrading notes 2013-08-09 22:23:35 +02:00
Michael Wallner
2d403f0c1d haha, a bit too optimistic; not merged yet 2013-08-09 21:33:48 +02:00
Michael Wallner
867b6c05e7 add upgrading notes about bison and 2Guploads 2013-08-09 21:16:47 +02:00
Dmitry Stogov
2bc886abed Merge branch 'PHP-5.5' 
* PHP-5.5:
  Replce ZEND_FETCH_* instructions with IS_CV if possible

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
 2013-08-09 17:52:22 +04:00
Dmitry Stogov
b27f6826d4 Replce ZEND_FETCH_* instructions with IS_CV if possible 2013-08-09 17:47:47 +04:00
Michael Wallner
7c3afd31f9 fix test 2013-08-09 13:30:29 +02:00
Michael Wallner
611122c22e Merge branch '2Guploads' 
* 2Guploads:
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
  unify stdint type usage
 2013-08-09 11:47:25 +02:00
Michael Wallner
5acdcbc0bc Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix bug #65391
  Update NEWS
  Update NEWS

Conflicts:
	ext/zlib/tests/bug65391.phpt
 2013-08-09 11:39:41 +02:00
Michael Wallner
5cea7a9047 fix bug #65391 
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
 2013-08-09 11:25:54 +02:00
Michael Wallner
b33824bfea Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #65391
  Update NEWS
 2013-08-09 11:21:50 +02:00
Michael Wallner
ac28283beb fix bug #65391 
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
 2013-08-09 11:14:04 +02:00
Yasuo Ohgaki
b6b425d2cf Fixed Bug #65315 session.hash_function silently fallback to default md5 2013-08-09 18:05:24 +09:00
Michael Wallner
742a0106fe use $YACC instead of 'bison' as suggested by Yasuo 2013-08-09 08:32:39 +02:00
Michael Wallner
1e30987a53 improve comments and messages as suggested 2013-08-09 08:31:40 +02:00
Yasuo Ohgaki
22d7002462 Update NEWS 2013-08-09 11:21:54 +09:00
Yasuo Ohgaki
fc7fe62e3b Update NEWS 2013-08-09 11:19:56 +09:00
Michael Wallner
3903c182da add excluded version exmaple 2013-08-08 21:45:08 +02:00
Michael Wallner
3e41201a6f make the bison version check a blacklist 
Let the bison version be checked by a blacklist (where no version
is blacklisted yet) and require at least bison 2.4
 2013-08-08 14:27:32 +02:00
Andrey Hristov
c53b425763 Merge branch 'PHP-5.5' 2013-08-08 14:05:18 +02:00
Andrey Hristov
c9243344a0 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-08 14:05:08 +02:00
Andrey Hristov
a188693a27 Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4 2013-08-08 14:04:19 +02:00
Andrey Hristov
f4f255016a Merge branch 'PHP-5.5' 2013-08-08 14:03:22 +02:00
Andrey Hristov
d3dae9a616 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-08 14:03:11 +02:00
Andrey Hristov
80fe5461a9 Merge branch 'PHP-5.3' into PHP-5.4 2013-08-08 14:03:00 +02:00
Andrey Hristov
42dbc598dd Merge branch 'PHP-5.5' 2013-08-08 13:53:08 +02:00
Andrey Hristov
1e2f72d6b6 Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5 2013-08-08 13:52:09 +02:00
Andrey Hristov
82a7ec72de add some tracing 2013-08-08 13:51:55 +02:00
Christopher Jones
ae4f8b2ab0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
 2013-08-07 13:14:46 -07:00
Christopher Jones
4ed133c4e2 Remove tabs on blanklines in Makefile sources. This prevents a 
'suspicious line' warning when editing & saving Makefile using Emacs.
 2013-08-07 13:14:00 -07:00
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
d8344c18a8 Merge branch 'PHP-5.5' 
* PHP-5.5:
  One more './configure --help' alignment fix
 2013-08-06 11:23:21 -07:00
Christopher Jones
c932d532c8 One more './configure --help' alignment fix 2013-08-06 11:23:02 -07:00
Christopher Jones
4c3c9d1fe5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00