clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
88,077 Commits 491 Branches 1,363 Tags 838 MiB
3224459232
Commit Graph

3736 Commits

Author SHA1 Message Date
Xinchen Hui
3224459232 Merge branch 'master' of https://git.php.net/repository/php-src 2015-02-13 14:29:27 +08:00
Reeze Xia
39203441ed Fixed phpdbg backtrace argument's name missing 2015-02-13 06:22:04 +00:00
Xinchen Hui
da7d94cd73 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/soap.c
	ext/standard/basic_functions.c
	ext/zlib/zlib.c
 2015-02-13 13:28:24 +08:00
Xinchen Hui
5e7fd50376 Remove useless TSRMLS by merge 2015-02-13 11:02:37 +08:00
Xinchen Hui
309e90638d Cleanup globals initialization 2015-02-13 10:58:35 +08:00
Anatol Belski
61d85cedd5 fix values for gid and uid 
As stated by MSDN, these fields are always set to zero
 2015-02-11 11:46:31 +01:00
Anatol Belski
e6bf9b45dd silence unused variable warning 2015-02-11 11:46:30 +01:00
Anatol Belski
12a42433b2 remove useless condition 2015-02-11 11:46:29 +01:00
Reeze Xia
6c9d75b44d Add missing header inclusion 2015-02-10 22:30:54 +08:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
Anatol Belski
575199a754 removed sapi/webjames 2015-02-10 08:41:22 +01:00
Anatol Belski
f5c796cee4 removed sapi/tux 2015-02-10 08:40:59 +01:00
Anatol Belski
3ef7136cae removed sapi/thttpd 2015-02-10 08:40:34 +01:00
Anatol Belski
15ab00ddf6 removed sapi/roxed 2015-02-10 08:40:13 +01:00
Anatol Belski
49fc89d1cb removed sapi/pi3web 2015-02-10 08:39:31 +01:00
Anatol Belski
6482e90970 removed sapi/phttpd 2015-02-10 08:38:47 +01:00
Anatol Belski
e6f62c50cc removed sapi/milter 2015-02-10 08:38:21 +01:00
Anatol Belski
4fedc42c2b removed sapi/isapi 2015-02-10 08:37:44 +01:00
Anatol Belski
591f16f392 removed sapi/continuity 2015-02-10 08:37:14 +01:00
Anatol Belski
6d7d1a1bde removed sapi/caudium 2015-02-10 08:36:43 +01:00
Anatol Belski
fd9c95bac5 removed sapi/apache2filter 2015-02-10 08:36:12 +01:00
Anatol Belski
53349d69dd removed sapi/apache_hooks 2015-02-10 08:35:36 +01:00
Anatol Belski
51ca2dba53 removed sapi/apache 2015-02-10 08:34:56 +01:00
Anatol Belski
4949fa55ab removed sapi/aolserver 2015-02-10 08:33:34 +01:00
George Wang
c90cd09331 Fixed #68790 (Missing return) 2015-02-07 12:19:53 -05:00
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
ac3a4e4200 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66479: Wrong response to FCGI_GET_VALUES
 2015-02-01 00:36:21 -08:00
Frank Stolle
6a905a9a3c 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.

Conflicts:
	sapi/cgi/fastcgi.c
 2015-02-01 00:35:23 -08:00
Stanislav Malyshev
62d6f91b3e Merge branch 'pull-request/1011' 
* pull-request/1011:
  Fix for a previous commit. i read it as size_t, notssize_t.
  Remove useless tests
 2015-02-01 00:21:47 -08:00
Joshua Rogers
d492bc8b6b Fix for a previous commit. i read it as size_t, notssize_t. 2015-02-01 19:02:25 +11: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
6a960b6d1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:40 -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
2cdbd3537f use right sizeof for memset 2015-01-31 21:30:58 -08:00
Stanislav Malyshev
41bdd6e7cc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add mitigation for CVE-2015-0235 (bug #68925)
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:12:20 -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
Michael Wallner
130d7320b1 Merge branch 'incorrect_close' of github.com:MegaManSec/php-src 
* 'incorrect_close' of github.com:MegaManSec/php-src:
  Use correct deallocator in phpdbg
 2015-01-30 23:11:33 +01:00
Michael Wallner
c0477fbcb5 Squashed commit of the following: 
commit 5cee14b14b
Merge: 6392e1e 59593ba
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 19:15:48 2015 +0800

    Merge branch 'master' of git://github.com/php/php-src

commit 6392e1e86a
Author: Shafreeck Sea <renenglish@gmail.com>
Date:   Tue Jan 27 11:32:04 2015 +0800

    Remove duplicated line
 2015-01-30 23:01:26 +01:00
Anatol Belski
563e7822fd fix datatype mismatches, improve error checks 2015-01-30 16:31:19 +01:00
Xinchen Hui
88e13bda6a Fixed bug #68945 (Unknown admin values segfault pools) 2015-01-30 11:01:42 +08:00
Xinchen Hui
95142d9015 Merge branch 'PHP-5.6' 2015-01-27 22:25:55 +08:00
Xinchen Hui
b881de9937 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:25:45 +08:00
Xinchen Hui
4c5995b172 fcgi_write in fpm returns ssizt_t, but it returns int in cgi 2015-01-27 22:25:38 +08:00
Xinchen Hui
737b6f69e3 Merge branch 'PHP-5.6' 2015-01-27 22:20:17 +08:00
Xinchen Hui
92d56b0af6 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-27 22:20:03 +08:00
Xinchen Hui
c3ff9aa17d Revert previous unintentional change to this 2015-01-27 22:19:11 +08:00
Xinchen Hui
9fdf62d64a Merge branch 'PHP-5.6' 
Conflicts:
	sapi/cgi/cgi_main.c
 2015-01-27 22:15:12 +08:00