Commit Graph

128 Commits

Author SHA1 Message Date
Remi Collet
999370b756 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  NEWS
  Revert "Fix #77609: Tests from mailparse extension fails"
2019-03-20 11:55:06 +01:00
Remi Collet
32e7b0864c Revert "Fix #77609: Tests from mailparse extension fails"
This reverts commit 3ead672394.
2019-03-20 11:54:27 +01:00
Peter Kokot
c2fb85547d Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Update NEWS
  Fix #77609: Tests from mailparse extension fails
2019-03-01 22:44:37 +01:00
Ralf Habacker
3ead672394 Fix #77609: Tests from mailparse extension fails
Add installed php extensions to temporary created ini file

In php extensions configured with phpize, a temporarily generated
php.ini is used for testing, but currently contains no installed
PHP extensions, which is required by the mailparse extension,
for example.

Installed extensions must be added with their absolute path,
because the extension_dir parameter is already occupied.

See https://bugs.php.net/bug.php?id=77609
2019-03-01 22:32:01 +01:00
Peter Kokot
0f57a7f259 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Fix bug 76595: Update phpdbg man page
2018-08-04 06:37:15 +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
Anatol Belski
8cc0921846 Merge branch 'PHP-7.2'
* PHP-7.2:
  Remove some old sapi/apache_hooks and sapi/apache leftovers
2017-09-25 21:59:09 +02:00
Peter Kokot
3752d18ffe Remove some old sapi/apache_hooks and sapi/apache leftovers 2017-09-25 21:56:39 +02:00
Kalle Sommer Nielsen
bfdd22a3de Remove old references to SAPIs and extensions no longer in the core 2017-07-19 09:09:24 +02:00
Coenraad Loubser
9eaf551c86
pull-request/2393:
stop make install from clobbering default dot d configuration
2017-02-22 06:47:23 +00:00
Lior Kaplan
fb7d673ef2 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Align spacing in make install messages
  Add entry for re-fix of #70976 in commit 14e4d393
2016-02-08 20:29:24 +02:00
Lior Kaplan
6772fbff62 Align spacing in make install messages 2016-02-08 20:27:19 +02:00
Dmitry Stogov
7dac4d449f Add targets to simplify building PHP with FDO (Feedback Directed Optimisation)
PHP should be built with the folowing steps:

make clean
make -j4 prof-gen
; now php should be trained with some scripts
; for example `sapi/cgi/php -T 1000 /var/www/http/wordpress/index.php > /dev/null`
make prof-clean
make -j4 prof-use

The "properly" trained build may give up to 10% real performance boost!
"Improprly" trained PHP might be even slower.
2015-05-26 17:33:25 +03:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Xinchen Hui
aa23d754a9 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10 15:55:05 +08:00
Xinchen Hui
a930e04792 Do not remove *.1, it's not generated by make but configure 2014-03-10 15:54:20 +08:00
Will Fitch
a9b40a20fc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update gitignore and Makefile for additional entries
2014-01-23 21:35:24 -05:00
Will Fitch
c0acb9d5f6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Update gitignore and Makefile for additional entries
2014-01-23 21:34:57 -05:00
Will Fitch
c4c10a222e Update gitignore and Makefile for additional entries 2014-01-23 21:28:45 -05:00
Christopher Jones
ae4f8b2ab0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
2013-08-07 13:14:46 -07:00
Christopher Jones
4ed133c4e2 Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing & saving Makefile using Emacs.
2013-08-07 13:14:00 -07:00
Michael Wallner
14caf174ff unify stdint type usage
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones
3bbe5931bc Fixed bug #62691 (solaris sed has no -i switch)
Make 'make distclean' remove generated DTrace .h file
2013-08-05 15:18:12 -07:00
Christopher Jones
9cd1ac7b61 Merge branch 'PHP-5.5'
* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
2013-08-01 09:22:47 -07:00
Christopher Jones
d884ec15e9 Clean up the 'generated' phar.inc file.
When building outside the source tree the copied phar.inc needs to be removed,
but when building in the tree, the file must remain since it is part of the source.
See the copying logic in ext/phar/Makefile.frag.
2013-08-01 09:19:53 -07:00
Christopher Jones
1c91ca990f Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
2013-08-01 08:49:19 -07:00
Christopher Jones
146b933ab4 Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
This reverts commit 017145bc57.
2013-08-01 08:47:13 -07:00
Christopher Jones
1f6b940dd1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use PHP's major version when cleaning up Apache .module files
  Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:36:20 -07:00
Christopher Jones
c069b5f571 Use PHP's major version when cleaning up Apache .module files 2013-07-31 12:35:10 -07:00
Christopher Jones
017145bc57 Allow 'make distclean' to clean up the 'generated' phar.inc 2013-07-31 12:31:50 -07:00
Christopher Jones
7caea7d182 Clean generated OCI8 DTrace files in 'make distclean' 2013-07-31 12:01:35 -07:00
Christopher Jones
d84fa9731a Merge branch 'PHP-5.5'
* PHP-5.5:
  Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
2013-07-31 11:50:57 -07:00
Christopher Jones
4ed18d5955 Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc. 2013-07-31 11:49:29 -07:00
Christopher Jones
f5521a357a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
2013-07-31 10:00:05 -07:00
Christopher Jones
e3a4b87e89 Fixed bug #62691 (solaris sed has no -i switch)
Make 'make distclean' remove generated DTrace .h file
2013-07-31 09:58:28 -07:00
Christopher Jones
6af7526c77 Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing & saving Makefile using Emacs.
2013-07-30 13:36:10 -07:00
Xinchen Hui
4d804aa52d let make test report the run-test result 2012-11-25 12:03:54 +08:00
Xinchen Hui
f03a91226e let make test report the run-test result
(patch by reeze.xia@gmail.com)
2012-11-25 11:45:36 +08:00
Bernhard K. Weisshuhn
180767373d make failed tests fail the test target
I don't see any reason to ignore failed tests. This makes it
unnecessarily difficult to use ci, also for module builds.
2012-11-11 20:11:06 +01:00
Jani Taskinen
25aee9cad9 - Implemented FR #53271, FR #52410 (Building multiple PHP binary SAPIs and one SAPI module the same time)
# Bug #53271, Bug #52410
2010-11-13 23:13:07 +00:00
Derick Rethans
0c19577c28 - Clean up the generated tmp-php.ini after make test has run. 2010-09-05 12:29:47 +00:00
Kalle Sommer Nielsen
dd8e59da8f Removed safe_mode
* Removed ini options, safe_mode*
 * Removed --enable-safe-mode --with-exec-dir configure options on Unix
 * Updated extensions, SAPI's and core
 * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-26 23:53:30 +00:00
Felipe Pena
3d1e73eb82 - Fix regexp 2010-04-23 19:20:55 +00:00
Kalle Sommer Nielsen
0cec1e6e13 Update the deprecated directives in the MakeFile 2010-04-22 23:23:10 +00:00
Kalle Sommer Nielsen
8087be61d0 * Changed the way removed ini directives are shown so its easier to add new ones
* Removed define_syslog_variables and its associated functions
2010-04-12 01:52:55 +00:00
Jani Taskinen
47a9c71dcc - Fixed bug #49935 (Deprecated warnings make "make test" to fail) 2009-11-27 23:34:36 +00:00
Jani Taskinen
9a12e9a1f9 - Fixed "make test" in phpize builds when ini file(s) contain extension directives 2009-11-18 17:52:22 +00:00
Jani Taskinen
2d549b7bdf - Fixed bug #48835 (Deprecated php.ini options in old php.inis makes "make test" to fail) 2009-07-24 20:24:12 +00:00
Jani Taskinen
d671793295 - There is only one Makefile that needs removing 2009-07-21 13:57:33 +00:00
Jani Taskinen
e5e6f553a2 MFH 2008-08-13 00:53:28 +00:00