Bob Weinand
5b1f6caaf0
Merge branch 'PHP-5.6'
2013-12-22 00:57:31 +01:00
Bob Weinand
129fb22b37
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:55:46 +01: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
Andrey Hristov
406d5a5ecc
Merge branch 'PHP-5.6'
...
Conflicts:
NEWS
UPGRADING
2013-12-04 16:20:03 +02: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
Ferenc Kovacs
d17b684b91
bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
2013-11-06 14:03:24 +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
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Stanislav Malyshev
2c23004a1e
next is 5.5.2
2013-07-21 21:16:39 -07:00
Stanislav Malyshev
b9e3f737d9
5.4.19 is next
2013-07-17 13:51:15 -07:00
David Soria Parra
83fc53acb9
Bump version
2013-06-19 22:11:52 +02:00
Stanislav Malyshev
dda3f404ec
5.4.18 next
2013-06-18 22:58:11 -07:00
Stanislav Malyshev
c53058763a
5.4.17 is next
2013-05-21 23:36:28 -07:00
Stanislav Malyshev
a58a279d7b
5.4.16-dev
2013-04-24 10:15:35 -07:00
Nuno Lopes
e694d40963
allow lcov 1.10
2013-04-13 16:56:30 -04:00
Nuno Lopes
adc17bff57
allow lcov 1.10
2013-04-13 16:53:39 -04:00
Nuno Lopes
dacbf70f92
allow lcov 1.10
2013-04-13 16:51:58 -04:00
Stanislav Malyshev
f982aaafa7
will be 5.4.15
2013-03-27 14:00:12 -07:00
Stanislav Malyshev
31a6f8b7f4
5.4.13 branched, now it's 5.4.14
2013-02-26 22:25:33 -08:00
Stanislav Malyshev
09b6e33b40
branched 5.4.12
2013-01-29 12:33:45 -08:00
Stanislav Malyshev
5894aa0950
5.4.12-dev
2013-01-03 17:25:56 -08:00
Stanislav Malyshev
c3b6f6feed
5.4.11-dev
2012-12-04 21:30:50 -08:00
Stanislav Malyshev
7262bf67a2
5.4.10-dev
2012-11-24 16:24:05 -08:00
David Soria Parra
d71577d2df
Bump version to 5.6.0
2012-11-13 20:43:08 +01:00
David Soria Parra
012519839a
Bump version to 5.5.99 and reset NEWS
2012-11-13 17:42:01 +01:00
Stanislav Malyshev
9e3396b85d
5.4.9-dev
2012-10-03 18:36:17 -07:00
Stanislav Malyshev
78cffe0c4d
5.4.7 branched
2012-08-28 22:07:08 -07:00
Adam Harvey
14847af41d
Update version numbers to 5.4.7-dev.
2012-08-17 23:07:54 +08:00
Nikita Popov
f4ce364628
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
2012-08-13 16:54:53 +02:00
Andrew Faulds
d12f8d6790
Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
...
- removed php_logo_guid()
- removed php_egg_logo_guid()
- removed php_real_logo_guid()
- removed zend_logo_guid()
- removed logo GUID handling
- removed logo GUIDs from source
- added logo data URIs instead for phpinfo()
- added credits to phpinfo() page, but hidden by default
2012-07-14 21:44:21 +01:00
Nikita Popov
ca59e5464d
Add empty Generator class
2012-05-20 00:03:27 +02:00
Stanislav Malyshev
be8b1c74cf
to 5.4.5-dev
2012-05-15 22:46:49 -07:00
