php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 01:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
104,305 Commits 547 Branches 1,481 Tags
12e2fc4ab6034cce3fc63e2000cbeb6cf0deed13
Commit Graph

4597 Commits

Author SHA1 Message Date
Xinchen Hui
9f5ed133b3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
 2017-10-15 10:29:28 +08:00
Xinchen Hui
49702ad7fb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
 2017-10-15 10:28:46 +08:00
Xinchen Hui
816758eda2 Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function) 2017-10-15 10:28:28 +08:00
Nikita Popov
0e8ccb179d Merge branch 'PHP-7.1' into PHP-7.2 2017-10-05 12:26:19 +02:00
Nikita Popov
d34c8fa802 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-05 12:25:37 +02:00
Mathieu CARBONNEAUX
6b9ccda936 Fixed bug #75311 2017-10-05 12:24:57 +02:00
Joe Watkins
6e39258302 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Typo in status.html
 2017-10-03 07:22:15 +01:00
Joe Watkins
d0cda9d0bd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Typo in status.html
 2017-10-03 07:22:04 +01:00
Viktor Szépe
e995b7e475 Typo in status.html 
feet needs -> fit needs
 2017-10-03 07:21:53 +01:00
Joe Watkins
b0950ff854 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:20:46 +01:00
Joe Watkins
1981c48e60 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix CGI m4 config message when CGI is disabled
 2017-09-27 06:20:34 +01:00
Peter Kokot
29e673f8ed Fix CGI m4 config message when CGI is disabled 2017-09-27 06:20:09 +01:00
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
Remi Collet
ee84f34344 rename test 2017-09-19 07:26:53 +02:00
Remi Collet
cfc6c4d297 Fixed Bug #75212 php_value acts like php_admin_value 2017-09-18 18:08:51 +02:00
Anatol Belski
d8f1afb45e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix the version check causing the test fail
 2017-09-18 12:06:54 +02:00
Anatol Belski
5c59dd0047 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix the version check causing the test fail
 2017-09-18 12:06:23 +02:00
Anatol Belski
9641586efa Fix the version check causing the test fail 2017-09-18 12:04:31 +02:00
Remi Collet
d99cd28925 fix tests for 32-bit 2017-09-13 12:20:05 +02:00
Nikita Popov
d78a7909c8 Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 18:14:16 +02:00
Nikita Popov
0b69ce72b8 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 18:14:10 +02:00
Nikita Popov
42549b7844 Add missing null termination 2017-09-05 18:13:50 +02:00
Nikita Popov
9fbd8620fb Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 16:24:40 +02:00
Nikita Popov
e866e05b0d Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 16:24:21 +02:00
Bouke van der Bijl
cd9d90f4d4 Fixed bug #70470 2017-09-05 16:23:32 +02:00
Anatol Belski
93c2c56a1b Rework automatic interactive cli activation 
There are still systems delivering buggy console info. If a file was
passed, obviously no interaction is meant.
 2017-08-03 11:23:50 +02: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
Joe Watkins
515b396889 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update copyright year to 2017
 2017-07-24 17:24:22 +01:00
Joe Watkins
b44484b912 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update copyright year to 2017
 2017-07-24 17:24:10 +01:00
Peter Kokot
924ff6164e Update copyright year to 2017 2017-07-24 17:23:57 +01:00
Xinchen Hui
463413db53 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #74947 (Segfault in scanner on INF number)

Conflicts:
	Zend/zend_language_scanner.c
 2017-07-21 12:02:54 +08:00
Joe Watkins
8c238c15bc Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
 2017-07-17 06:52:43 +01:00
Joe Watkins
2e82ed9b73 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug 74913 redirecting incorrect include <sys/poll.h>
 2017-07-17 06:51:47 +01:00
Peter Kokot
0db20a7cb1 Fixed bug 74913 redirecting incorrect include <sys/poll.h> 2017-07-17 06:50:59 +01:00
Anatol Belski
8871d2d12e Fixed bug #74849 Process is started as interactive shell in PhpStorm 2017-07-03 21:59:31 +02: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
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Richard Fussenegger
5fa1cd224b Fixed php_socket_t to int conversion 
This warning was about a possible loss of data due to the downcast of `php_socket_t` to `int`. The former maps to a platform specific type, hence, it might downcast from a 64 bit integer to a 32 bit intger.

Fixed possibly overflowing vars

Due to the change from `int` to `php_socket_t` some variables might overflow now. Changed all variables that might be affected.

Revert "Fixed possibly overflowing vars"

This reverts commit bf64fd5984.

Use aliased PHP socket type

Using the alias protects us from changes to the underlying type.

Removed ignored nfds argument

The `nfds` argument to the Win32 `select` function is always ignored, regardless of its actual value. Hence, we should not pass it in the first place. See https://msdn.microsoft.com/en-us/library/windows/desktop/ms740141(v=vs.85).aspx for reference.

Target value is not a pointer

Avoid overflow in loop
 2017-06-15 23:48:03 +02:00
Xinchen Hui
e33bc38e83 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:45 +08:00
Xinchen Hui
caf35c5cf5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:35 +08:00
Manuel Mausz
91f129ebf7 Add simple cli test for PATH/HOST ini sections 2017-06-09 23:28:19 +02:00
Dmitry Stogov
fc1ae1d1d3 Exclude warm-up requests from callgrind profile. 2017-05-31 16:16:56 +03:00
Remi Collet
37a16a32c9 missing fix for another test 2017-05-29 12:07:13 +02:00
Anatol Belski
38ee9f7c0d extend condition 2017-05-27 13:30:55 +02:00