clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
105,526 Commits 493 Branches 1,365 Tags 848 MiB
cdd9eb8c4a
Commit Graph

4663 Commits

Author SHA1 Message Date
Remi Collet
2cdde35d0f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix man page installation
 2018-08-16 06:54:57 +02:00
Remi Collet
1f2f2c6b96 fix man page installation 
Since 91996e7ee5
phpdbg.1 is in buildir, not in srcdir
 2018-08-16 06:53:56 +02:00
Peter Kokot
9286681bac Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug 76595: Update phpdbg man page
 2018-08-04 06:35:40 +02:00
Kevin Abel
91996e7ee5 Fix bug 76595: Update phpdbg man page 
Send phpdbg.1 man page through configure replacements
Update phpdbg.1 man page to include all options
Fixes formatting to be more consistent with php.1
Fix paragraph whitespace and ignore phpdbg.1
 2018-08-04 06:34:40 +02:00
Christoph M. Becker
2458dab466 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix arginfo wrt. optional/required parameters
 2018-06-25 11:54:45 +02:00
Christoph M. Becker
6b5597f7d8 Fix arginfo wrt. optional/required parameters 
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required.  We mark them as such.
 2018-06-25 11:52:17 +02:00
Nikita Popov
44f4d2be01 Merge branch 'PHP-7.1' into PHP-7.2 2018-06-20 12:30:19 +02:00
Nikita Popov
69dee5c732 Fixed bug #73342 
Directly listen on socket, instead of duping it to STDIN and
listening on that.
 2018-06-20 12:28:15 +02:00
Jakub Zelenka
dd622f9ca9 Port FPM test 023 and 024 to the new FPM testing 2018-06-12 18:09:27 +01:00
Jakub Zelenka
bc58ba750f Merge branch 'PHP-7.1' into PHP-7.2 2018-06-12 18:03:01 +01:00
Jakub Zelenka
ea592e6b6c Rewrite FPM tests 2018-06-12 17:59:28 +01:00
Anatol Belski
a8422edced Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix cli server test fails after recent AppVeyor image update
 2018-05-18 13:40:42 +02:00
Anatol Belski
ee0ca6470d Fix cli server test fails after recent AppVeyor image update 2018-05-18 13:38:53 +02:00
Anatol Belski
398204ace9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76333 PHP built-in server does not find files if root path contains special characters
 2018-05-13 18:42:36 +02:00
Anatol Belski
ad787626a4 Fixed bug #76333 PHP built-in server does not find files if root path contains special characters 2018-05-13 18:40:32 +02:00
Thomas Punt
972c4869a7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Allocate default ini values into persistent memory
 2018-04-26 21:09:08 +01:00
Thomas Punt
2513da4b4c Allocate default ini values into persistent memory 2018-04-26 21:08:19 +01:00
Thomas Punt
b3fff5fc41 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix memory leak when phpdbg fails to start up
 2018-04-26 16:42:21 +01:00
Thomas Punt
435e812c09 Fix memory leak when phpdbg fails to start up 2018-04-26 16:39:52 +01:00
Jakub Zelenka
4302c0b542 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-13 20:12:03 +01:00
Michał Górny
4ea7f3467d Support using acl_* functions on *BSD 
The *BSD systems have ACL routines built-in in libc rather than
in separate libacl. Update the configure check to detect that and enable
ACL support without adding 'acl' library.
 2018-04-13 19:48:13 +01:00
George Wang
043ac320a0 Merge branch 'PHP-7.1' into PHP-7.2 2018-04-10 16:49:29 -04:00
George Wang
5b529bbc94 Updated LiteSpeed SAPI to 7.1 . 2018-04-10 16:48:04 -04:00
Xinchen Hui
474895915e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
 2018-04-10 16:32:28 +08:00
Xinchen Hui
8cfb648761 Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite) 2018-04-10 16:32:08 +08:00
George Wang
1e1695e8de Merge branch 'PHP-7.1' into PHP-7.2 2018-04-03 11:47:41 -04:00
George Wang
37e1d7c776 [BUGFIX] allow php_admin_value to override value set in php.ini without restriction, like adding an extra directory to open_basedir. 2018-04-03 11:46:24 -04:00
Jakub Zelenka
8b642af484 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-30 17:58:29 +01:00
Jakub Zelenka
0be5b9e6b0 Prevent modifying of getenv result 2018-03-30 17:20:19 +01:00
Jacob Hipps
008eb1461c 68440: ensure backwards compatibility with FPM_SOCKETS var; fix sockname size 2018-03-30 17:20:19 +01:00
Jacob Hipps
77bf9245d2 Fix bug #68440: [sapi/fpm] use multiple FPM_SOCKETS env vars to prevent hitting MAX_ARG_STRLEN with a large number of pools 2018-03-30 17:20:19 +01:00
Anatol Belski
600b6277f8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Do not set PR_SET_DUMPABLE by default
  Do not set PR_SET_DUMPABLE by default
 2018-03-27 14:20:53 +02:00
Anatol Belski
6b39c81957 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Do not set PR_SET_DUMPABLE by default
  Do not set PR_SET_DUMPABLE by default
 2018-03-27 14:20:10 +02:00
Jakub Zelenka
276d19feaa Do not set PR_SET_DUMPABLE by default 2018-03-27 14:19:36 +02:00
Anatol Belski
d1ed6b1b15 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Disable PGO for phpdbg
 2018-03-08 11:49:25 +01:00
Anatol Belski
34b9f9dedf Disable PGO for phpdbg 
For executable files, the linker seems to have issues dealing with the
empty profiling database. As PGO is unlikely to bring any benefit in
this case, the easiest is to disable it.
 2018-03-08 11:48:37 +01: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
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
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
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
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
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
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
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