diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-09-27 06:15:26 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-09-27 06:15:47 +0100 |
| commit | af71942da2efa6e959e46643c29fb15e82408c0d (patch) | |
| tree | bce4838d65f80979cabe1b17aecb9a482af8b771 | |
| parent | 2dd77456fe0f9e01f80414790653ce94156f67ab (diff) | |
| parent | 6d0391b1a41e03b4fc62c982b27700eb88e620db (diff) | |
| download | php-git-af71942da2efa6e959e46643c29fb15e82408c0d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #75248 and #75251
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | sapi/litespeed/Makefile.frag | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -11,6 +11,11 @@ PHP NEWS . Fixed bug #75220 (Segfault when calling is_callable on parent). (andrewnester) +- litespeed: + . Fixed bug #75248 (Binary directory doesn't get created when building + only litespeed SAPI). (petk) + . Fixed bug #75251 (Missing program prefix and suffix). (petk) + - MySQLi: . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol) diff --git a/sapi/litespeed/Makefile.frag b/sapi/litespeed/Makefile.frag index 125a3b13da..2010d8d623 100644 --- a/sapi/litespeed/Makefile.frag +++ b/sapi/litespeed/Makefile.frag @@ -5,5 +5,5 @@ $(SAPI_LITESPEED_PATH): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_LITESPEED_OB install-litespeed: $(SAPI_LITESPEED_PATH) @echo "Installing PHP LiteSpeed binary: $(INSTALL_ROOT)$(bindir)/" - @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/lsphp - + @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) + @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)lsphp$(program_suffix) |