1
0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Commit Graph

617 Commits

Author SHA1 Message Date
Yasuo Ohgaki cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Andrea Faulds 35b463a2c5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:43:59 +00:00
Andrea Faulds aee271ec0d Implemented FR #65917 (getallheaders() is not supported by the built-in...)
- Implemented apache_request_headers() and getallheaders() alias in CLI server
- Implemented apache_response_headers() in CLI server using FastCGI code

Conflicts:
	NEWS
	UPGRADING
2013-11-12 20:27:34 +00:00
Anatol Belski c675980046 Merge branch 'pull-request/500'
* pull-request/500:
  limit virtual_cwd_activate() duplicated call to ZTS only
  reverted the previous commit, both calls are needed in TS mode
  virtual_cwd_activate() should be called only in one place
  back to do_alloca()
  removed unnecessary call
  simplify the state free macros
  compact the code to preserve the error info after state freeing
  back to do_alloca(), reverted the wrong replacement
  enabled windows to use stack in both ts/nts mode, some more fixes
  moved to do_alloca() usage where appropriate
  fixed invalid free
  fixed virtual cwd header in phar
  updated NEWS
  fixed all the places where last error could be lost
  preserve the error code
  applied and fixed the original patch
  initial move on renaming files and fixing includes

Conflicts:
	ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
Michael Wallner 8962f3ff0c fix limitation of upload size == (U)INT_MAX in CGI 2013-10-28 07:37:47 +01:00
Anatol Belski 8591a52fab fixed invalid free 2013-10-21 11:15:31 -07:00
Dmitry Stogov 66cd9ef04c Merge branch 'PHP-5.5'
* PHP-5.5:
  Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 11:34:19 +04:00
Dmitry Stogov 51fca2b4b3 Reverted patch (it was used for internal testing and was committed by accident) 2013-10-01 11:32:11 +04:00
Dmitry Stogov 3eba8cf673 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added support for GNU Hurd. (Svante Signell)

Conflicts:
	NEWS
2013-09-27 13:44:31 +04:00
Dmitry Stogov f904830012 Added support for GNU Hurd. (Svante Signell) 2013-09-27 13:43:25 +04:00
Stanislav Malyshev 3c349cfa50 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #61345: fix install of CGI binary
  Fix #61345: fix install of CGI binary
2013-08-10 17:36:17 -07:00
Stanislav Malyshev 3f99ba6351 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix #61345: fix install of CGI binary
2013-08-10 17:33:28 -07:00
Michael Heimpold cdedee3fa1 Fix #61345: fix install of CGI binary
When CLI was not built but only CGI binary, then a sequence of

$ ./buildconf
$ ./configure  --prefix=/usr/local/phpcgi --disable-cli
$ make -j8
$ sudo rm -rf /usr/local/phpcgi
$ sudo make install

results in the following error:

/bin/bash /srv/smb/php-src.test/libtool --silent --preserve-dup-deps --mode=install cp ext/opcache/opcache.la /srv/smb/php-src.test/modules
Installing shared extensions:     /usr/local/phpcgi/lib/php/extensions/no-debug-non-zts-20121212/
Installing PHP CGI binary:        /usr/local/phpcgi/bin/
cp: cannot create regular file `/usr/local/phpcgi/bin/#INST@28245#': No such file or directory
make: *** [install-cgi] Fehler 1

The solution is to create the binary directory before copying the
CGI binary as e.g. CLI does.

Signed-off-by: Oliver Metz <oliver.metz@gmx.de>

[extensive commit message]

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2013-08-10 17:33:24 -07: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
Remi Collet 8f0567581e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
2013-07-02 10:47:38 +02:00
Remi Collet c940aab789 Fixed Bug #65143 Missing php-cgi man page
Currently php-cgi man page is a simple redirect to
php (CLI) man page.

Could be splited / improved in the future.
2013-07-02 10:42:47 +02:00
Arnaud Le Blanc 18f45c535b Added PHP_FCGI_BACKLOG, overrides the default listen backlog 2013-06-29 17:52:04 +02:00
Stanislav Malyshev c877fcf6ec Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Added HTTP codes as of RFC 6585
2013-02-17 01:20:14 -08:00
Jonh Wendell 59b016192d Added HTTP codes as of RFC 6585
Added descriptions for the new HTTP codes:

- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
2013-02-17 01:18:40 -08:00
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui 0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui 75cf51de50 Merge branch 'PHP-5.4' 2012-08-18 12:22:47 +08:00
Xinchen Hui ebefbdb76d Fix test failed 2012-08-18 12:21:48 +08:00
Xinchen Hui 401230c7e1 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix test (no charset outputed)
2012-07-18 19:50:59 +08:00
Xinchen Hui 8f89cfb548 Fix test (no charset outputed) 2012-07-18 19:50:30 +08:00
Rasmus Lerdorf 8208462fc1 This test depends on the default_charset setting, so set it to
UTF-8 for consistent output
2012-05-23 17:48:01 -07:00
Rasmus Lerdorf 523fd2c244 Fix broken apache_request_headers test
This test depends on the default_charset setting, so set it to
UTF-8 for consistent output
2012-05-23 17:38:23 -07:00
Stanislav Malyshev 08779069e8 Merge branch 'PHP-5.4'
* PHP-5.4:
  c++ comments
  restore BC
  ws + restore BC to apache_request_headers
  fix bug #61807 - Buffer Overflow in apache_request_headers
2012-05-08 10:21:10 -07:00
Stanislav Malyshev 057f4719d3 c++ comments 2012-05-08 10:19:24 -07:00
Stanislav Malyshev 1919ec5a55 restore BC 2012-05-08 10:19:24 -07:00
Stanislav Malyshev bd8912e47c ws + restore BC to apache_request_headers 2012-05-08 10:19:23 -07:00
Stanislav Malyshev 20364bcff9 fix bug #61807 - Buffer Overflow in apache_request_headers 2012-05-08 10:19:23 -07:00
Stanislav Malyshev b50101764b improve fix for CVE-2012-1823 2012-05-07 12:14:57 -07:00
Stanislav Malyshev 857fc1b473 Merge branch 'PHP-5.4'
* PHP-5.4:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
2012-05-07 12:12:48 -07:00
Stanislav Malyshev 36587ff335 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  improve fix for CVE-2012-1823
  Fix for CVE-2012-1823
2012-05-07 12:10:36 -07:00
Stanislav Malyshev 7de4b75f74 improve fix for CVE-2012-1823 2012-05-07 12:08:36 -07:00
Rasmus Lerdorf 004941af15 Fix for CVE-2012-1823 2012-05-07 12:06:45 -07:00
David Soria Parra d3a13c2a10 Merge branch 'PHP-5.4'
By Rasmus Lerdorf
* PHP-5.4:
  Fix for CVE-2012-1823 (cherry picked from commit 29300b1f9d)
  Fix for CVE-2012-1823
2012-05-05 17:37:35 +02:00
Rasmus Lerdorf 0556103f6a Fix for CVE-2012-1823 2012-05-04 11:58:24 -07:00
Felipe Pena 47cff264df Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:14:00 -03:00
Felipe Pena d2798c6035 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net
2012-04-19 23:13:37 -03:00
Felipe Pena c3b0fb4fbe - Fixed bug #54197 ([PATH=] sections incompatibility with user_ini.filename set to null) patch by ab@php.net 2012-04-19 23:12:47 -03:00
Xinchen Hui 06290cc049 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #61605 (header_remove() does not remove all headers)

Conflicts:
	NEWS
2012-04-04 16:16:54 +08:00
Xinchen Hui efd671f242 Fixed bug Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:14:28 +08:00
Xinchen Hui 896c4539df Fixed bug #61605 (header_remove() does not remove all headers) 2012-04-04 16:01:43 +08:00
Ondřej Surý d1fd5432e1 Fixed bug #61043 (Regression in magic_quotes_gpc fix for CVE-2012-0831) 2012-03-21 08:44:59 +01:00
Dmitry Stogov 106e88b3db Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Dmitry Stogov 2e94124494 Fixed reinitialization of SAPI callbacks after php_module_startup() 2012-02-14 13:31:23 +00:00
Dmitry Stogov 87c038be06 Always restore PG(magic_quote_gpc) on request shutdown 2012-02-02 12:58:54 +00:00