Commit Graph

1047 Commits

Author SHA1 Message Date
Adam Baratz
ce4e1c0e15 fix typo in configure message 2016-07-06 10:36:19 -04:00
Davey Shafik
1ed53e8691 Bump versions 2016-07-05 12:33:37 -07:00
Davey Shafik
c196cac71e Bump versions/dates for release of 7.1.0alpha3 2016-07-05 12:29:02 -07:00
Joe Watkins
378de94faa bump version after release 2016-06-22 06:33:20 +01:00
Joe Watkins
4e312c3f00 bump version for release 2016-06-22 06:30:30 +01:00
Dmitry Stogov
0d51ebd1a5 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)
2015-12-03 13:40:53 +03:00
Dmitry Stogov
59424bb7bd Fixed bug #71006 (symbol referencing errors on Sparc/Solaris) 2015-12-03 13:28:41 +03:00
Xinchen Hui
ae196280bb Revert pushed by mistake
Revert "Revert "Remove assumption that extensions are in ext/ext-name""

This reverts commit 7e47bf1e65.
2015-11-16 18:04:29 +08:00
Xinchen Hui
7e47bf1e65 Revert "Remove assumption that extensions are in ext/ext-name"
This reverts commit 82b73fd1e3.

Conflicts:

	build/genif.sh
	build/order_by_dep.awk
2015-11-13 14:27:59 +08:00
Anatol Belski
ac4601eadd 7.0.1 is next 2015-10-27 20:08:54 +01:00
Anatol Belski
360f96e216 bump versions in master 2015-09-14 23:46:10 +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
Nikita Popov
0284755d97 Always use libtool --silent
We don't need this spam for debug builds. Now make --quiet does
something useful for debug builds as well.
2015-07-17 19:03:56 +02:00
Xinchen Hui
90df7e75e6 Merge branch 'master' into merge-fastcgi
Conflicts:
	sapi/fpm/fpm/fpm_main.c
2015-05-27 16:36:15 +08: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
Xinchen Hui
9f1788f00d Only link fastcgi into fpm and cgi 2015-05-26 13:55:39 +08:00
Xinchen Hui
e383cb4493 Move fastcgi.c to main 2015-05-19 16:04:35 +08:00
Dmitry Stogov
e38ed4c28f Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc().
The actual reallocation routiones are seprated from inlined code to reduce code size.
2015-04-16 14:45:08 +03:00
Kalle Sommer Nielsen
8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Levi Morrison
017f89e871 Move check for __builtin_expect to configure
This allows __builtin_expect to be used more accurately
2015-03-22 10:31:14 -06:00
Ferenc Kovacs
cfd7f5c8a3 Revert "Disable PEAR by default"
This reverts commit df984ad4f5.
2015-01-26 11:14:53 +01:00
Nikita Popov
df984ad4f5 Disable PEAR by default
Given how it doesn't work and it doesn't seem like it will start
working in the immediate future.
2015-01-25 14:49:35 +01:00
Anatol Belski
1463115e7e Merge branch 'PHP-5.6'
* PHP-5.6:
  fix timelib build configuration

Conflicts:
	ext/date/config.w32
	ext/date/config0.m4
	win32/build/config.w32
	win32/build/config.w32.phpize.in
2015-01-21 16:26:36 +01:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski
35bfa022f9 Merge branch 'PHP-5.6'
* PHP-5.6:
  make timelib_config.h inclusion configurable

Conflicts:
	win32/build/config.w32
	win32/build/config.w32.phpize.in
2015-01-21 13:55:07 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Ferenc Kovacs
b0a26ab8f8 PHP-5.6.6 is next 2015-01-06 22:58:22 +01:00
Stanislav Malyshev
e6e0b51db9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
2015-01-04 20:55:25 -08:00
Stanislav Malyshev
ec550cd783 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixes #66764 -  configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly
2015-01-04 20:55:17 -08:00
Ferenc Kovacs
83db775323 Fixes #66764 - configure doesn't define EXPANDED_DATADIR / PHP_DATADIR correctly 2015-01-03 19:18:07 +01:00
Julien Pauli
3656349990 5.5.21 now 2014-11-26 11:31:58 +01:00
Ferenc Kovacs
fa2a2a1059 PHP-5.6.5 is next 2014-11-26 10:21:37 +01:00
Julien Pauli
c7f074b163 5.6.4 now 2014-10-28 16:00:19 +01:00
Julien Pauli
71e200b338 PHP 5.5.20 now 2014-10-28 15:01:53 +01:00
Anatol Belski
dd85f3ae1c one more file to enable static tsrmls 2014-10-15 17:08:32 +02:00
Anatol Belski
8aeffdd74c moved most of the core to use static tsrm ls cache pointer
plus apache2handler, cli and cgi
2014-10-15 16:33:40 +02:00
Ferenc Kovacs
646b4cca85 PHP-5.6.3 is next 2014-10-15 14:08:32 +02:00
Anatol Belski
45e23645a4 linux compat for the static tsrm ls cache pointer 2014-10-02 08:45:53 +02:00
Julien Pauli
cfe8a8b968 5.5.19 now 2014-10-01 16:16:05 +02:00
Anatol Belski
ef6e9386e3 remove some remains from the old patch 2014-09-25 19:27:36 +02:00
Anatol Belski
7099736dfa Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  Fix tests/serialize/bug64146.phpt
  Remove zend_dynamic_array
  Remove static allocator
  Fixed typo
  Fix list() destructuring to special variables
  Remove php_varname_check
  Avoid useless reference counting
  Specialization (only IS_VAR ad IS_CV operands may be references)
  Optimized unset()
  Make error paths to be UNEXPECTED
  Replace IS_OP?_TMP_FREE() with more clear (OP?_TYPE == IS_TMP_VAR)
2014-09-23 00:32:48 +02:00
Nikita Popov
982f02afe6 Remove zend_dynamic_array
This was introduced back in 2000 to test a new hashtable
implementation and is no longer used.
2014-09-22 23:45:13 +02:00
Anatol Belski
fb17d6516d Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  fixed copying of the struct as it's not being modified
  avoid strlen usage in loop
  Removes accidentally added files.
  Reverts some unwanted changes
  Deletes patch leftovers
  Replaces php5 with php7, without whitespace changes.
2014-09-20 21:37:19 +02:00
krakjoe
b3aebda9ea native tls initial patch 2014-09-20 20:22:14 +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
Nikita Popov
c343ca4efb Split inheritance into separate file
This moves handling of inheritance and interface implementation
from zend_compile.c into a separate zend_inheritance.c file, as
this is not really related to compilation.
2014-09-19 19:54:37 +02:00
Julien Pauli
8ff79d3e89 5.6.2 now 2014-09-11 18:37:25 +02:00
Michael Wallner
80ef586541 Merge branch 'PHP-5.6'
* PHP-5.6:
  make LTP version check a blacklist
2014-09-10 13:31:39 +02:00