php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,148 Commits 549 Branches 1,485 Tags
7768f5e2decfed03515f4bc7cdb3536a3c575a52
Commit Graph

4638 Commits

Author SHA1 Message Date
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
Xinchen Hui b65abecfdf regenerated with newer re2c 2018-01-02 13:54:29 +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 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
Nikita Popov f01d5faf30 Merge branch 'PHP-7.1' into PHP-7.2 2017-12-16 17:21:01 +01:00
David Carlier 14393b5fb3 Move includes in ps_title.c 
The HAVE_UNISTD_H check has to be after including config.h.

Also include sys/types.h, which may be needed for setproctitle.
 2017-12-16 17:20:05 +01:00
Anatol Belski b6a27c7332 Revert "Fix macro redefinition warnings" 
This reverts commit 23d2bd3748.
 2017-11-30 13:21:04 +01:00
Anatol Belski 23d2bd3748 Fix macro redefinition warnings 
The corresponding implementations are available from APR.
 2017-11-30 12:40:52 +01:00
Anatol Belski 0b30461764 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Follow up on bug #75574 for FCGI side
 2017-11-28 20:34:44 +01:00
Anatol Belski 8b57a5bca0 Follow up on bug #75574 for FCGI side 2017-11-28 20:33:11 +01:00
Anatol Belski 79940993de Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #73830 Directory does not exist.
 2017-11-28 12:42:40 +01:00
Anatol Belski 578049fdb6 Fixed bug #73830 Directory does not exist. 2017-11-28 12:41:49 +01:00
Nikita Popov 1310234aa3 Fix printf format issues on i386 2017-11-17 22:25:03 +01:00
Anatol Belski 85021602ba Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update NEWS
  Fix bug 60471 by correctly identifying unused speculative preconnections
 2017-11-14 20:03:02 +01:00
Sammy Kaye Powers 3bc5c9f118 Fix bug 60471 by correctly identifying unused speculative preconnections 
* Correctly identify unused speculative preconnections from browsers
  like Chrome and Firefox
* Add a new message to the debug level that is emitted when a TCP
  connection is closed without sending any request (a preconnection)
* Fix an issue where the existing debug messages were not being
  displayed even when debug mode was enabled
 2017-11-14 20:00:45 +01:00
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