clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,272 Commits 491 Branches 1,363 Tags 837 MiB
7cef66c635
Commit Graph

226 Commits

Author SHA1 Message Date
Julien Pauli
736b91c650 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
 2016-01-04 18:13:38 +01:00
Lior Kaplan
53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Bob Weinand
4dee0c4a14 Fixed bug #70899 (buildconf failure in extensions) 2015-11-17 21:07:29 +01:00
Adam Harvey
de63ebf5f4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix NEWS indentation.
  Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4.
 2015-08-27 16:01:33 -07:00
Adam Harvey
e872f4d9c1 Don't detect FreeBSD 10 as FreeBSD 1 in libtool.m4. 
Fixes bug #70370 (Bundled libtool.m4 doesn't handle FreeBSD 10 when building
extensions).
 2015-08-27 15:59:59 -07:00
Anatol Belski
ac2f6ddd4f here string isn't supported by every shell 2015-08-21 19:11:53 +02:00
Ferenc Kovacs
5ed1b70841 $() isn't supported on every shell 2015-08-21 18:27:03 +02:00
Bob Weinand
823062d6c1 Fix invalid range error by gawk in order_by_dek.awk 2015-08-21 00:13:03 +02:00
Bob Weinand
82b73fd1e3 Remove assumption that extensions are in ext/ext-name 
Fixes also a weird ln (symlink) hack for phpdbg
 2015-08-21 00:13:02 +02:00
Michael Wallner
afcaa52c73 Merge branch 'PHP-5.6' 
* PHP-5.6:
  make buildconf work as expected; autoconf really needs some help with all those external m4s

Conflicts:
	build/build2.mk
 2015-02-04 09:50:14 +01:00
Michael Wallner
4c3b4dc74a make buildconf work as expected; 
autoconf really needs some help with all those external m4s
 2015-02-04 09:39:02 +01:00
Michael Wallner
f5808f32ac Partially revert. I did not notice there's alaready a .PHONY target for 
generated_lists. Force removing configure before running autoconf is
enough to make this work as expected.
 2015-01-31 10:57:53 +01:00
Michael Wallner
fa453d5abd make buildconf actually work 2015-01-30 17:58:49 +01:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910 
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
 2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Lior Kaplan
a8b97086d7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  config.guess: add ppc64le / ppcle support by Anton Blanchard <anton@samba.org>
  libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au>
 2014-08-28 00:48:28 +03:00
Lior Kaplan
302ccc195b libtool: powerpc*le-linux support by Alan Modra <amodra@bigpond.net.au> 
Patch created using the following changes in libtool:
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=75ffb257
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=056889b8
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=bd998a7e
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=429d40a0
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=8a8dfaec
 2014-08-28 00:37:01 +03:00
Ferenc Kovacs
d1fb869e78 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
 2014-06-30 01:34:47 +02:00
Ferenc Kovacs
a52616b759 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
 2014-06-30 01:34:05 +02:00
Ferenc Kovacs
a7d1656b96 Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0 
Simplest fix is to remove the specific checks for freebsd1* as it also matches freebsd10,
and nobody should be using >=PHP 5.4 with freebsd 1.x(if it is even possible to make it
to compile there).
 2014-06-30 01:31:10 +02:00
Sobak
244c289f9c Removed cvsclean and svnclean tools 2014-06-08 19:27:58 -07:00
Lior Kaplan
c09bd9def0 Merge branch 'PHP-5.4' into PHP-5.5 2014-02-14 15:30:00 +02:00
Mats Lindh
6188674f1e Replace old SVN references to Git 2014-02-09 21:17:26 +02:00
Michael Wallner
f32d2ac3aa fix bug #51076 (race condition in shtool's mkdir -p) 2013-10-08 08:37:08 +02:00
Christopher Jones
c932d532c8 One more './configure --help' alignment fix 2013-08-06 11:23:02 -07:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text. 
Whitespace changes and a couple of grammar fixes.
 2013-08-06 11:06:09 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Scott MacVicar
0c83631303 Fix building of pure C++ extensions as static 2011-08-09 18:12:06 +00:00
Scott MacVicar
b8b9ed2421 Fix building of pure C++ extensions as static 2011-08-09 18:12:06 +00:00
Jérôme Loyet
3af61f1bf2 find option '-not' is not POSIX compliant 2011-07-13 23:28:48 +00:00
Jérôme Loyet
a93fd42b6f find option '-not' is not POSIX compliant 2011-07-13 23:28:48 +00:00
Christopher Jones
9622d0050d Relax autoconf support from 2.60 to 2.59. This is the version available on Centos/RHEL/Oracle Linux 5.6 2011-06-08 01:25:35 +00:00
Christopher Jones
2e235022e9 Relax autoconf support from 2.60 to 2.59. This is the version available on Centos/RHEL/Oracle Linux 5.6 2011-06-08 01:25:35 +00:00
Rasmus Lerdorf
353077d234 Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
Rasmus Lerdorf
cc8ecca0b3 Get rid of autoconf warnings 2011-05-16 00:14:47 +00:00
Rasmus Lerdorf
438cc7f201 Drop support for autoconf < 2.60 in trunk and the 
new PHP_5_4 branch. autoconf >= 2.60 should finally
be working now.
 2011-05-15 06:09:21 +00:00
Rasmus Lerdorf
245d15fdc6 Drop support for autoconf < 2.60 in trunk and the 
new PHP_5_4 branch. autoconf >= 2.60 should finally
be working now.
 2011-05-15 06:09:21 +00:00
Jani Taskinen
116e217799 - Update shtool to 2.0.8 2010-02-18 08:33:48 +00:00
Raphael Geissert
dcfb8ee366 Fix race condition in shtool's mkdir -p implementation (bug #51076) 2010-02-18 00:30:12 +00:00
Jani Taskinen
b55675e517 - Fix bad merge (Sorry Ilia..) 2009-11-28 00:06:54 +00:00
Jani Taskinen
9cfacabe55 - Re-fixed bug #47104 (Linking shared extensions fails with icc) 2009-11-27 12:50:29 +00:00
Jani Taskinen
5f8df17097 - Upgraded bundled libtool to 1.5.26 2009-11-23 21:53:30 +00:00
David Soria Parra
495a5ab005 Add actions for the gitclean target. 2009-08-11 02:21:09 +00:00
Jani Taskinen
36b94bea86 - Fixed problem with vcsclean which caused it not to really clean whole tree 2009-07-21 12:01:26 +00:00