php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 02:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
106,925 Commits 547 Branches 1,481 Tags
3b5b64ce75b00a00a256f1a59655a0830d071036
Commit Graph

4708 Commits

Author SHA1 Message Date
George Wang
1777db1fdf Merge branch 'PHP-7.2' 2018-02-27 23:34:01 -05:00
George Wang
66e3912f3a Merge branch 'PHP-7.1' into PHP-7.2 2018-02-27 23:33:36 -05:00
George Wang
d4387fca0a revert last change, for PHP7 no need to do strlen() + 1 for hash look up. 2018-02-27 23:31:43 -05:00
George Wang
17e49ba79a Merge branch 'PHP-7.2' 2018-02-27 23:21:32 -05:00
George Wang
3af5722e11 Merge branch 'PHP-7.1' into PHP-7.2 2018-02-27 23:21:04 -05:00
George Wang
2b033607f3 [BUGFIX] calling php_ini_activate_per_host_config() with correct name length. 2018-02-27 23:18:51 -05:00
George Wang
2ec012fa2a Merge branch 'PHP-7.2' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2018-02-27 13:57:06 -05:00
George Wang
9607d15d7d Merge branch 'PHP-7.1' into PHP-7.2 2018-02-27 13:56:19 -05:00
George Wang
97ff815cbb release LiteSpeed SAPI 7.0. 
add CRIU support.
add support for [PATH=] and [HOST=] sections in php.ini
 2018-02-27 13:54:28 -05:00
Gabriel Caruso
ded3d984c6 Use EXPECT instead of EXPECTF when possible 
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
 2018-02-20 21:53:48 +01:00
Nikita Popov
b0af9ac733 Avoid live range references in opcodes 
Don't store the live range of the freed variable for FREE_ON_RETURN
frees, instead look it up at runtime. As this is an extremely
unlikely codepath (in particular, it requires a loop variable with
a throwing destructor), saving the runtime lookup of the live range
is not worth the extra complexity this adds everywhere else.
 2018-02-16 21:30:48 +01:00
Anatol Belski
abf5534113 Reduce var scope 2018-02-16 15:44:43 +01:00
Anatol Belski
535497cb97 Remove always true condition 2018-02-16 15:44:42 +01:00
Anatol Belski
7761c819bf Simplify declaration 2018-02-16 15:44:42 +01:00
Tom Van Looy
7672f8be0b Fix: follow the indent of the other configure options 2018-02-15 08:49:58 +01:00
Gabriel Caruso
21e3b0c70c Remove trailing whitespace in inc files 2018-02-10 19:20:23 +01:00
Gabriel Caruso
2d48d734a2 Fix some misspellings 2018-02-06 16:59:00 +01:00
Dmitry Stogov
ca035f26aa Moved "zval.u2.cache_slot" into free room of "zend_op" 2018-02-05 19:41:47 +03:00
Gabriel Caruso
fef879a2d6 Use bool instead of boolean while throwing a type error 
PHP requires boolean typehints to be written "bool" and disallows
"boolean" as an alias. This changes the error messages to match
the actual type name and avoids confusing messages like "must be
of type boolean, boolean given".

This a followup to ce1d69a1f6, which
implements the same change for integer->int.
 2018-02-04 23:09:40 +01:00
Gabriel Caruso
ce1d69a1f6 Use int instead of integer in type errors 
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
 2018-02-04 19:08:23 +01:00
Gabriel Caruso
affc20f891 Use bool instead of boolean in proto 2018-02-04 17:00:24 +01:00
Gabriel Caruso
84488d921b Remove superfluous SKIPIF sections in more tests 2018-02-04 16:57:08 +01:00
Lee Hsun
4b19f710e1 Set max_requests to 0 
The value will always be overwritten by fpm_run(), and the default
value there is 0 and not 500.
 2018-02-03 16:15:12 +01:00
Gabriel Caruso
8034fdc9d9 Use int instead of integer in proto 2018-02-02 22:32:15 +01:00
Anatol Belski
bced074124 Fix race conditions with Apache vhost vs. per dir config 
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.

(cherry picked from commit 73eb5a78b9)
 2018-02-01 15:24:31 +01:00
Dmitry Stogov
ba298725d1 Changed CATCH instruction format (extended_value moved into op2, op2 into result, result into extended_value) 2018-01-31 22:39:30 +03:00
Anatol Belski
3c6e1c2b81 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix race conditions with Apache vhost vs. per dir config
 2018-01-31 20:26:20 +01:00
Anatol Belski
73eb5a78b9 Fix race conditions with Apache vhost vs. per dir config 
If the same php_value/php_flag is present in httpd.conf and .htaccess,
the key is potentially shared between threads. Unfortunately we can't
intern these keys using the current mechanism, because the MPM is setup
before the SAPI module setup is even started. A more elegant way were
to implement a kind of string pool for the thread safe Apache SAPI
config directives with the mechanism similar to what is done for the
SAPI setup now, but doing a separate management.
 2018-01-31 20:15:30 +01:00
motecshine
0e10bed83e Remove double include of fpm_scoreboard.h 2018-01-15 12:22:04 +01:00
Anatol Belski
50431d0820 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix invalid free
 2018-01-13 12:33:45 +01:00
Anatol Belski
1350f4f997 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix invalid free
 2018-01-13 12:33:02 +01:00
Anatol Belski
2503a27ae0 Fix invalid free 2018-01-13 12:32:22 +01:00
Nikita Popov
b942648771 Merge branch 'PHP-7.2' 2018-01-12 18:18:45 +01:00
Nikita Popov
f8c889760c Merge branch 'PHP-7.1' into PHP-7.2 2018-01-12 18:18:34 +01:00
Nikita Popov
9e98e99a3a Revert "Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)" 
This reverts commit 816758eda2.

After this commit relative router scripts were resolved against
docroot rather than shell cwd.
 2018-01-12 18:11:12 +01:00
Kalle Sommer Nielsen
1d0ac9819a Use PHP_WIN32 2018-01-04 08:14:41 +01:00
Gabriel Caruso
471da3eddc Trailing whitespaces on sapi/* 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-04 02:39:54 -02:00
Gabriel Caruso
6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui
a76eeea736 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Happy new year (Update copyright to 2018)

Conflicts:
	ext/phar/LICENSE
 2018-01-03 16:02:15 +08:00
Xinchen Hui
0e62639d28 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Happy new year (Update copyright to 2018)
 2018-01-03 16:00:34 +08:00
Lior Kaplan
fbfdd1e1c4 Happy new year (Update copyright to 2018) 2018-01-02 23:42:29 +02:00
Xinchen Hui
b65abecfdf regenerated with newer re2c 2018-01-02 13:54:29 +08:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Xinchen Hui
d6b2756da1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Updated NEWS
  Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
 2017-12-27 12:52:44 +08:00
Xinchen Hui
6693898b30 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
 2017-12-27 12:52:06 +08:00
Xinchen Hui
dc3822c343 Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry) 2017-12-27 12:51:50 +08:00
Sara Golemon
171ecbb8d1 Fix darwin builds of phpdbg using frameworks 2017-12-21 17:03:04 -05:00
Sebastian Ramadan
168c6cda8f Transmit phpdbg webdata len in little-endian 
Rather than using machine-endianness through a UB cast.
 2017-12-17 00:24:45 +01:00