Commit graph

108 commits

Author SHA1 Message Date
Stanislav Malyshev
c440043de5 Merge branch 'pull-request/884'
* pull-request/884:
  Fix #66479: Wrong response to FCGI_GET_VALUES
2015-02-01 00:36:53 -08:00
Stanislav Malyshev
141b14454c Merge branch 'PHP-5.6'
* PHP-5.6:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Conflicts:
	ext/sockets/sockaddr_conv.c
	ext/standard/dns.c
2015-01-31 21:50:08 -08:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018 Use better constant since MAXHOSTNAMELEN may mean shorter name 2015-01-31 21:46:56 -08:00
Stanislav Malyshev
237128603f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:04:55 -08:00
Anatol Belski
563e7822fd fix datatype mismatches, improve error checks 2015-01-30 16:31:19 +01:00
Xinchen Hui
9fdf62d64a Merge branch 'PHP-5.6'
Conflicts:
	sapi/cgi/cgi_main.c
2015-01-27 22:15:12 +08:00
Xinchen Hui
8c2d91761a Also Fixed #68571 in CGI SAPI, and some cleanup 2015-01-27 22:11:23 +08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski
f00cf67d1e C89 compat 2014-11-12 17:57:19 +01:00
Anatol Belski
54868c84ce fix int to void* cast on x64 2014-11-12 17:57:15 +01:00
Frank Stolle
1106b10ae8 Fix #66479: Wrong response to FCGI_GET_VALUES
Requesting Get-Values via FCGI caused an "endless" loop over the last requested parameter and ended with an invalid response. this patch solves this loop bug.
2014-10-30 13:24:06 +01:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
69d6e093e9 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed the cast and incompatible pointer warning

Conflicts:
	sapi/cgi/fastcgi.c
2014-09-12 14:37:54 +02:00
Anatol Belski
fdfc31a4f7 fixed the cast and incompatible pointer warning 2014-09-12 14:36:00 +02:00
Xinchen Hui
4a12b4cef9 closesocket is defined in php_network.h 2014-08-28 13:20:43 +08:00
Xinchen Hui
7a90e40af7 closesocket is already defined in main/php_network.h 2014-08-28 13:18:55 +08:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
21f623e945 ported fcgi 2014-08-19 23:12:17 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Pierre Joye
47335ef956 fix casting 2014-05-15 20:30:30 +02:00
Dmitry Stogov
72c287bd23 Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word 2014-04-21 18:25:34 +04:00
Dmitry Stogov
76cc99fe60 Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc) 2014-04-03 15:26:23 +04:00
Dmitry Stogov
e85790a4d4 Use better data structures (incomplete) 2014-02-14 15:11:21 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +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
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
10cfbb814f Added checks for malformated FastCGI requests (Edgar Frank) 2011-01-19 08:38:25 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Dmitry Stogov
bd8f3908c4 Reverted wrong patch 2010-09-20 10:45:22 +00:00
Kalle Sommer Nielsen
210fe80bd5 Fix incompatible types, we need to use a char here for recv() 2010-09-19 19:18:30 +00:00
Dmitry Stogov
c290767ed7 Fixed bug #46723 (FastCGI persistent connection is incredibly slow due to TCP ack delay). 2010-09-06 11:11:40 +00:00
Felipe Pena
7396657fc1 - Fixed compiler warning (missing return statement) 2010-09-01 23:21:03 +00:00
Dmitry Stogov
6bc16cce8f Reduced overhead of FastCGI using near-perfect hash function and predcalculated hash values. 2010-09-01 15:34:48 +00:00
Dmitry Stogov
001d83dc47 invalid length 2010-09-01 14:42:43 +00:00
Dmitry Stogov
d4c2c6c6ba Don't check FCGI_WEB_SERVER_ADDRS for UNIX sockets 2010-08-27 08:50:32 +00:00
Dmitry Stogov
a95dd97752 Added apache compatible functions (apache_child_terminate, getallheaders, apache_request_headers, apache_response_headers) to FastCGI SAPI 2010-08-27 08:34:44 +00:00
Dmitry Stogov
d663b9cc77 Don't try to read the rest of malformed FCGI requests, close immediately. It saves one recv() call for proper FCGI request. 2010-08-25 13:48:16 +00:00
Dmitry Stogov
7fc86e5cb4 ws 2010-08-25 11:44:15 +00:00
Kalle Sommer Nielsen
250fcf9317 Nuke compiler warning, wrong fix that shouldn't have been in the previously commit 2010-08-18 18:00:33 +00:00