Commit Graph

1009 Commits

Author SHA1 Message Date
Ferenc Kovacs
1efe5b1157 5.6.12 next 2015-06-25 00:21:45 +02:00
Ferenc Kovacs
4d8ae36695 move to 5.6.11-dev 2015-05-28 02:05:50 +02:00
Ferenc Kovacs
9c7496e0dd 5.6.10 will be next 2015-04-30 00:01:55 +02:00
Ferenc Kovacs
a5e68f72a7 5.6.9 is up next 2015-04-01 01:30:51 +02:00
Ferenc Kovacs
d4d05c8919 5.6.8 up next 2015-03-05 19:07:23 +01:00
Julien Pauli
e6ea244004 5.6.7 now 2015-02-04 16:37:49 +01:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Ferenc Kovacs
b0a26ab8f8 PHP-5.6.6 is next 2015-01-06 22:58:22 +01: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
Ferenc Kovacs
646b4cca85 PHP-5.6.3 is next 2014-10-15 14:08:32 +02:00
Julien Pauli
cfe8a8b968 5.5.19 now 2014-10-01 16:16:05 +02:00
Julien Pauli
8ff79d3e89 5.6.2 now 2014-09-11 18:37:25 +02:00
Michael Wallner
4f2563329b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  make LTP version check a blacklist
2014-09-10 13:31:22 +02:00
Michael Wallner
3b78a24ee9 make LTP version check a blacklist 2014-09-10 13:30:52 +02:00
Julien Pauli
9266227402 5.5.18 now 2014-09-03 10:18:51 +02:00
Ferenc Kovacs
b165be9ae1 from now on, this should be 5.6.1-dev 2014-08-27 04:14:23 +02:00
Julien Pauli
05baed522f 5.5.17 now 2014-08-06 10:20:31 +02:00
Julien Pauli
a6e0751079 5.5.15 now 2014-06-11 10:21:26 +02:00
Julien Pauli
b4c92f31ad 5.5.14 now 2014-05-14 10:24:32 +02:00
Julien Pauli
b8d029435d 5.5.12RC1 setup 2014-04-15 17:57:27 +02:00
Julien Pauli
c4145619be 5.5.11RC1 preparation 2014-03-19 10:43:32 +01:00
Julien Pauli
0afcbb0ba9 5.5.11-dev next 2014-02-18 16:45:48 +01:00
Julien Pauli
277895717c 5.5.9-dev now 2014-01-10 10:01:30 +01:00
krakjoe
2a1b60569f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  stop warnings from unused opcode map
  - BFN
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
  Included new .c file in build too
  Fixed little typo in zend_vm_gen.php
  Moved to new file, killing a lot of warnings
2013-12-22 13:11:20 +00:00
Bob Weinand
7e3af096b3 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	Zend/zend_vm_opcodes.c
2013-12-22 00:54:59 +01:00
Bob Weinand
97bf254385 Included new .c file in build too 2013-12-22 00:52:05 +01:00
Julien Pauli
e9c6a1cfd2 5.5.8-dev now 2013-11-27 09:34:40 +01:00
Stanislav Malyshev
63f3ff7b5f 5.4.24-dev now 2013-11-27 00:13:45 -08:00
Julien Pauli
1984919ddc 5.5.7 now 2013-11-12 18:20:09 +01:00
Dmitry Stogov
af600c240d Merge branch 'const_scalar_exprs' of github.com:bwoebi/php-src into const_scalar_exprs
* 'const_scalar_exprs' of github.com:bwoebi/php-src:
  Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
  Added a few more operators
  Whitespace fix
  converted several switches to ifs and made more opcache friendly
  Fatal error about self referencing constants fixed
  Fixed mem leaks, added tests and ternary operator
  Working commit for constant scalar expressions (with constants). Tests will follow.

Conflicts:
	Zend/Makefile.am
	configure.in
	win32/build/config.w32
2013-11-06 15:41:33 +04:00
Bob Weinand
2361745806 Working commit for constant scalar expressions (with constants).
Tests will follow.
2013-10-31 08:57:12 +01:00
Stanislav Malyshev
4ded6ee971 5.4.23-dev 2013-10-29 18:11:02 -07:00
Adam Harvey
70c3a722e2 Increment version number, since this will be 5.5.6. 2013-10-23 12:36:27 -07:00
Anatol Belski
e30b2aae5a initial move on renaming files and fixing includes 2013-10-17 09:43:52 +02:00
Stanislav Malyshev
b2f8f35a88 5.4.22-dev now 2013-10-01 22:25:56 -07:00
Julien Pauli
0e10f26e27 5.5.5 now 2013-09-04 11:22:23 +02:00
Stanislav Malyshev
7beef74a82 5.4.21 now 2013-09-03 13:38:15 -07:00
Stanislav Malyshev
53d9643431 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  bump version
  Update NEWS

Conflicts:
	configure.in
	main/php_version.h
2013-08-19 23:23:21 -07:00
Stanislav Malyshev
d487f5e9ac bump version 2013-08-19 23:19:51 -07:00
Michael Wallner
611122c22e Merge branch '2Guploads'
* 2Guploads:
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
  unify stdint type usage
2013-08-09 11:47:25 +02: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
4c3c9d1fe5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -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
Stanislav Malyshev
68e8326e0e Merge branch 'PHP-5.5'
* PHP-5.5:
  non living code related typo fixes
2013-08-04 16:07:13 -07:00