archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
142550 commits 526 branches 1434 tags 865 MiB
Commit graph

183 commits

Author SHA1 Message Date
George Wang
751d19f698 [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), but not applies. 
[BUGFIX] when lsapi used the php_value has higher priority then ini_set when called from the script by itself .
 2017-06-27 23:14:36 -04:00
Thomas Punt
9f08aff3fd Remove superfluous allocation checks around ZMM-based functions 2017-04-02 00:58:19 +02:00
Joe Watkins
409467dc2f
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Remove remnants of TSMRLS_* macro calls
 2017-01-18 17:46:35 +00:00
Joe Watkins
bbe21ccf38
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Remove remnants of TSMRLS_* macro calls
 2017-01-18 17:46:11 +00:00
Thomas Punt
fb8486f3bd
Remove remnants of TSMRLS_* macro calls 2017-01-18 17:42:45 +00:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Anatol Belski
afb6ca2566 Finish remaining replacement uint => uint32_t 
Tthe core should be normalized now, no uints anymore
 2016-12-22 14:32:02 +01:00
George Wang
248ef30abe Merge branch 'PHP-7.0' into PHP-7.1 2016-09-19 10:50:21 -04:00
George Wang
ca24c58e65 Merge branch 'PHP-5.6' into PHP-7.0 2016-09-19 10:49:26 -04:00
George Wang
56fa36b0a8 Fix wrong year in previous commit. 2016-09-19 10:46:46 -04:00
George Wang
0a09eecfcc code cleanup. 2016-08-28 22:31:08 -04:00
George Wang
413bd261ec Merge branch 'PHP-7.0' into PHP-7.1 2016-08-28 22:29:38 -04:00
George Wang
ca1eb585ee Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2016-08-28 22:23:28 -04:00
George Wang
c73bcbefbd Added .user.ini support. 
Added LSPHPRC support.
update LiteSpeed SAPI version to 6.10 .
 2016-08-28 21:49:30 -04:00
Martin Vobruba
2809a676b5 Pass error severity to SAPI modules and raise corresponding error level in Apache 2016-07-11 09:34:48 +02:00
Dmitry Stogov
22ecd4428a Fixed compilation warnings 2016-06-21 17:56:07 +03:00
Dmitry Stogov
c8706331b5 Cleanup zend_signal API 2016-06-20 14:58:42 +03:00
Dmitry Stogov
3abd9c34c1 Removed unused callbacks 2016-06-20 13:27:59 +03:00
George Wang
69112d7e97 Fixed runtime php.ini override, ini name length is off by 1. 
(cherry picked from commit 5bcb7a7019)
 2016-01-05 23:48:42 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
George Wang
0a1a4dc033 Fixed a bug in apache_request_headers() that adds an extra \0 to header name. 2015-12-17 15:20:08 -05:00
George Wang
6d933b463e Bumped SAPI version to 6.9 2015-12-09 11:37:46 +01:00
George Wang
b3458eddfd Added "mod_auth_basic" to apache module list. 2015-12-09 11:37:45 +01:00
George Wang
42789e2b8a Fixed __DIR__ in CLI mode. 2015-12-09 11:37:40 +01:00
George Wang
00ed55005a Bumped SAPI version to 6.9 2015-12-09 00:28:08 -05:00
George Wang
0d84097d44 Added "mod_auth_basic" to apache module list. 2015-12-09 00:27:55 -05:00
George Wang
84fd8ffa2a Fixed __DIR__ in CLI mode. 2015-12-09 00:25:48 -05:00
Dmitry Stogov
01ed736827 Don't keep dangling pointers 2015-09-23 16:16:04 +03:00
Joe Watkins
85a511d2c1 fix zend signal and tsrm compat 2015-09-01 09:34:54 +01:00
George Wang
3a169f6c0d bump API version to 6.8 2015-06-22 23:39:35 -04:00
George Wang
2423b0bded bump API version to 6.8 2015-06-22 23:35:21 -04:00
George Wang
c90cd09331 Fixed #68790 (Missing return) 2015-02-07 12:19:53 -05:00
Xinchen Hui
1b53a99fbf Remove dead codes 2015-01-19 10:46:59 -05:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
d805fa0d81 Fixed #68790 (Missing return) 2015-01-10 22:19:49 -05:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Xinchen Hui
f579ae81c9 Fixed build of litespped 2014-12-29 13:46:01 +08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
George Wang
dce692dfa0 made lsapi_main.c compatible with PHP7/phpng . 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-11-20 16:54:42 -05:00
George Wang
620db04e91 made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:50:15 -05:00
George Wang
79de59e862 set default response code to 200 2014-11-03 11:43:22 -05:00
George Wang
4435161456 set default response code to 200 2014-11-03 11:43:04 -05:00
George Wang
2fd7d60ea0 Merge branch 'master' of git.php.net:php-src 2014-10-03 16:43:58 -04:00
George Wang
a7d2747890 Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:42:42 -04:00
George Wang
5b08e56eca Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:42:27 -04:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00