clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,656 Commits 491 Branches 1,363 Tags 841 MiB
57f33b4ce2
Commit Graph

192 Commits

Author SHA1 Message Date
Joe Watkins
474ee702ab
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75248 and #75251
 2017-09-27 06:16:13 +01:00
Joe Watkins
af71942da2
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75248 and #75251
 2017-09-27 06:15:47 +01:00
Peter Kokot
6d0391b1a4
Fix bug #75248 and #75251 2017-09-27 06:15:12 +01:00
Nikita Popov
042ff13ca9 Merge branch 'PHP-7.1' into PHP-7.2 2017-08-02 18:18:23 +02:00
Nikita Popov
9871555090 Merge branch 'PHP-7.0' into PHP-7.1 2017-08-02 18:16:56 +02:00
George Wang
e78712791d take care of compile warnings. 2017-08-02 11:59:41 -04:00
George Wang
79128b34ff Merge branch 'PHP-7.1' 2017-06-27 23:18:27 -04:00
George Wang
4e4f2f9f89 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-27 23:16:25 -04:00
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
Joe Watkins
64e80f5358
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Use proper file extension for the README
 2017-01-08 21:05:36 +00:00
Joe Watkins
c846daef28
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use proper file extension for the README
 2017-01-08 21:05:24 +00:00
Markus Staab
5b5483dc8e
Use proper file extension for the README 2017-01-08 21:05:06 +00:00
Joe Watkins
14be227325
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix 404 links in Litespeed README - Bug 73890
 2017-01-08 20:28:22 +00:00
Joe Watkins
230b387e8a
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix 404 links in Litespeed README - Bug 73890
 2017-01-08 20:28:05 +00:00
Peter Kokot
7f1247004e
Fix 404 links in Litespeed README - Bug 73890 2017-01-08 20:27:48 +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
Julien Pauli
51e7415575 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory
 2016-07-11 14:59:24 +02:00
Julien Pauli
fc2c301fe2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Remove needless zeroing of anonymously mmap'd memory
  Remove needless zeroing of anonymously mmap'd memory
 2016-07-11 14:58:55 +02:00
Michael McConville
9dd5d96332 Remove needless zeroing of anonymously mmap'd memory 
All existing systems zero anonymously mmapped memory, and if I
understand correctly POSIX will be specifying this soon. Many projects
already rely on it, so no reasonable system would return memory of
unspecified value.
 2016-07-11 14:56:17 +02: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
Lior Kaplan
85ce6a7d38 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Align spacing in make install messages
 2016-02-08 20:33:17 +02:00
Lior Kaplan
fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
 2016-02-08 20:29:24 +02:00
Lior Kaplan
6772fbff62 Align spacing in make install messages 2016-02-08 20:27:19 +02: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
3d5438bf7b Merge branch 'PHP-7.0' 
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
 2016-01-01 20:04:31 +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
70addd33d0 Fixed a bug in apache_request_headers() that adds an extra \0 to header name. 2015-12-17 15:24:59 -05: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
5a319a02d8 Add sanitizing checks for request data. 2015-12-09 11:37:43 +01:00
George Wang
af1ac753fe Clear secret after use. 2015-12-09 11:37:42 +01:00