mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
75,535 Commits 500 Branches 1,381 Tags 814 MiB
b8d029435d
Commit Graph

973 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Christopher Jones
d9788dd73f Bump to 5.4.4-dev 2012-05-14 12:43:36 -07:00
Christopher Jones
31ab04ee25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bump to next version

Conflicts:
	configure.in
	main/php_version.h
 2012-05-03 12:22:39 -07:00
Christopher Jones
0956c00af9 Bump to next version 
Bump PHP version number
 2012-05-03 12:03:49 -07:00
Stanislav Malyshev
7d3d38abec sync version 2012-04-24 16:30:37 -07:00
David Soria Parra
30aee4b861 Merge branch 'PHP-5.4' 
* PHP-5.4:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES
 2012-04-13 16:33:43 +02:00
David Soria Parra
de6dfe5bbd Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  configure.in: Check for README.GIT-RULES instead of README.SVN-RULES

Conflicts:
	configure.in
 2012-04-13 16:33:25 +02:00
David Soria Parra
e9b978c374 configure.in: Check for README.GIT-RULES instead of README.SVN-RULES 
We removed the README.SVN-RULES file. Configure checks for this file.
Let's check for the new README.GIT-RULES instead.
 2012-04-13 16:32:41 +02:00
Johannes Schlüter
fb124764de This will be PHP 5.3.12 2012-03-29 11:22:44 +02:00
Hannes Magnusson
54d82a962c Merge branch 'PHP-5.4' 
* PHP-5.4:
  This is a git checkout
  Revert incorrect fix
 2012-03-24 17:20:36 +01:00
Hannes Magnusson
7a1c765385 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  This is a git checkout
  Revert incorrect fix
 2012-03-24 17:20:14 +01:00