summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Factor our the active SAPI target getter functions.Michael Orlitzky2015-12-191-45/+17
| | | | | | | | | | | | | | | We had five functions doing essentially the same thing: 1. get_active_cli() 2. get_active_cgi() 3. get_active_fpm() 4. get_active_phpdbg() 5. get_active_apache2() Now that we have the sapi_active_link_path() function taking a SAPI name as an argument, these have been refactored. One new function get_sapi_active_target() takes a SAPI name as an argument and returns the name of the active target (using sapi_active_link_path).
* Generalize sapi_active_bin_link_path() to sapi_active_link_path().Michael Orlitzky2015-12-191-42/+22
| | | | | | | | | | Generalize the sapi_active_bin_link_path() to work with the "apache2" SAPI, too. Basically we just return the path of the mod_php symlink for that SAPI even though it's not an executable. After doing so, it makes sense to remove "bin" from the function name. The sapi_active_link_path() function, called with "apache2" as its argument, now replaces the get_apache2_active_symlink_path() function.
* Factor out the target major version number parsing into a function.Michael Orlitzky2015-12-191-5/+27
|
* Replace hard-coded SAPI executable link paths with a function call.Michael Orlitzky2015-12-191-11/+38
|
* Add support for the phpdbg SAPI target0.8.2Brian Evans2015-12-171-1/+39
| | | | Signed-off-by: Brian Evans <grknight@gentoo.org>
* Use AC_PROG_MKDIR_P macro/variable instead of "mkdir -p".Michael Orlitzky2015-12-101-1/+1
|
* Write an apache configuration file to /var/lib/eselect-php/mod_php.conf.Michael Orlitzky2015-12-101-3/+36
| | | | | | | | | | | | | | | | With the mod_php.so symlinking done, we realize a new problem: each apache module has its "module name" hardcoded into the binary. For example, in mod_php7.c, we find, AP_MODULE_DECLARE_DATA module php7_module and likewise with php5_module in the 5.x series of PHP. This means that we can't load both of these modules with one LoadModule statement regardless of its filename -- we need to know the module name too. This commit adds a function to write out an apache config file for the current active module. The main apache config file should Include this file, which will be updated whenever an apache2 target is set.
* Use {cli,cgi,fpm}_link variables where appropriate.Michael Orlitzky2015-12-101-5/+5
| | | | | These variables were all defined but not used. There were a few places where they could be profitably inserted.
* Switch get_active_apache2() and set_apache2() to the new mod_php.so symlink.Michael Orlitzky2015-12-101-18/+20
|
* Clean up error/info messages and quoting in the set_* functions.Michael Orlitzky2015-12-101-12/+12
|
* Add a missing die() on a call to rm.Michael Orlitzky2015-12-101-1/+1
|
* Rename our active DSO symlink to mod_php.so.Michael Orlitzky2015-12-101-8/+8
| | | | | | | | | | | | | Our DSO symlink used to be called libphp5.so or libphp7.so. This was very recently changed to an unversioned libphp.so, but at that point, we might as well just call it mod_php.so for consistency. Note that our 70_mod_php5.conf currently points directly to the libphp file and doesn't use the symlink, no matter its name. That will need to be changed. An unused cleanup() function was removed in the process, because the function that is actually used was updated to remove the obsolete libphp* symlinks.
* Add the get_apache2_active_symlink_path() function.Michael Orlitzky2015-12-101-0/+18
| | | | | The "active symlink" is used in two places: to determine the active version, and to set it. Factor its magic out into a separate function.
* Add curly braces around an interpolated string variable.Michael Orlitzky2015-12-101-1/+1
|
* Document the find_targets_apache2() and get_active_apache2() functions.Michael Orlitzky2015-12-101-0/+28
|
* Use fixed ".so" suffix for libphp instead of computing it.Michael Orlitzky2015-12-101-23/+7
| | | | | | | | | The only supported way to run PHP/Apache these days is as a dynamic shared object (DSO). The DSO will have an ".so" suffix, so we don't need to probe to see if libphp*.a exists. This also avoids a hidden dependency on libz, for whose static library we were probing.
* Test for sort/uniq executables and use the results instead of "sort -u".0.8.0Michael Orlitzky2015-12-061-4/+4
|
* Combine the libphp5/libphp7 branches.Michael Orlitzky2015-12-061-26/+32
|
* Line length, whitespace, and typo cleanup.Michael Orlitzky2015-12-061-15/+35
|
* Use AC_PROG_LN_S macro to replace "ln -s".Michael Orlitzky2015-12-061-4/+4
|
* Use AC_PROG_SED to determine POSIX-compatible sed path.Michael Orlitzky2015-12-061-5/+5
|
* Apply Brian Evans's patch to support php-7.x with apache2.Michael Orlitzky2015-12-061-8/+28
| | | | | Gentoo-Bug: 470986 Gentoo-Bug: 552156
* Update copyright year and some trivial whitespace changes (due to ebuild-mode).Michael Orlitzky2015-12-061-5/+3
|
* Rename the eselect module in preparation for autotools integration.Michael Orlitzky2015-12-061-0/+0
|
* Initial commit of the current release, v0.7.1.Michael Orlitzky2015-12-061-0/+352