php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-25 16:52:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
88,418 Commits 547 Branches 1,481 Tags
ec00a4de4e8db83c07afde9a182d43fe73d860c9
Commit Graph

3749 Commits

Author SHA1 Message Date
Reeze Xia
c6e415aeb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
	main/main.c
 2015-03-03 11:44:52 +08:00
Reeze Xia
4e2c87edb3 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:43:23 +08:00
George Wang
bb491c2de1 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 
Conflicts:
	sapi/litespeed/lsapilib.c
 2015-02-25 11:30:33 -05:00
George Wang
65810bf259 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 2015-02-25 11:24:19 -05:00
Dmitry Stogov
c2c78dc963 Added specialized versions of DO_FCALL handler: 
DO_ICALL - for internal functions
  DO_UCALL - for user functions
  DO_FCALL_BY_NAME - plain, most probably user, funcstions (not methods)
 2015-02-25 10:37:21 +03:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls 
which also comply with the current semantics for such macros
 2015-02-16 17:19:32 +01:00
Felipe Pena
a80ad10d9b - Fix merge 2015-02-16 12:21:20 -02:00
Antony Dovgal
c4664d1731 Merge branch 'pull-request/995' into PHP-5.6 
* pull-request/995:
  fix bug #68822 (request time is reset too early)
 2015-02-16 15:15:11 +03:00
redfoxli
3664345aba fix bug #68822 (request time is reset too early) 
this caused wrong time in the logs
 2015-02-16 15:10:09 +03:00
Dmitry Stogov
e10e151e9b Merged zend_array and HashTable into the single data structure. 
Now each HashTable is also zend_array, so it's refcounted and may be a subject for Copy on Write
zend_array_dup() was changed to allocate and return HashTable, instead of taking preallocated HashTable as argument.
 2015-02-13 22:20:39 +03:00
Anatol Belski
5d8ebcc73c remove useless condition (same as headers_list()) 2015-02-13 11:21:49 +01:00
Reeze Xia
bb20917049 Silence unused variable warning 2015-02-13 10:13:19 +00:00
Reeze Xia
46d9572945 Fixed phpdbg zend_bailout error when compiling syntax error code 
@krakjoe if there is something wrong, tell me plz
 2015-02-13 17:47:47 +08:00
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