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
73,017 Commits 500 Branches 1,381 Tags 814 MiB
01049ca7ae
Commit Graph

932 Commits

Author SHA1 Message Date
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
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
Hannes Magnusson
4fc4dd8760 This is a git checkout 2012-03-24 17:16:50 +01:00
Christopher Jones
949ef40139 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
730b54a374 Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Christopher Jones
15cd45e95e Fixed bug #61172 (Add Apache 2.4 support) 2012-03-02 00:07:41 +00:00
Stanislav Malyshev
23c62eb080 back to dev 2012-02-29 07:24:27 +00:00
Stanislav Malyshev
bfd72d0386 5.4.0 2012-02-29 07:22:43 +00:00
Stanislav Malyshev
6561d47e55 back to dev 2012-02-16 07:47:02 +00:00
Stanislav Malyshev
c1d415f798 5.4.0rc8 2012-02-16 07:45:08 +00:00
Stanislav Malyshev
9e9683b6b0 back to dev 2012-02-02 17:29:00 +00:00
Stanislav Malyshev
29e2f050f5 retag 5.4.0 rc7 2012-02-02 17:28:03 +00:00
Johannes Schlüter
1e16c821aa This will be PHP 5.3.11, 5.3.10 will be released from other branch 2012-02-02 17:25:23 +00:00
Stanislav Malyshev
3a95557cc3 back to dev 2012-02-02 06:09:50 +00:00
Stanislav Malyshev
9e9d6d3aaf 5.4.0 rc7 2012-02-02 06:08:29 +00:00
Michael Wallner
65948ec354 LTP/gcov/lcov 
- allow ltp v1.9
- make sure `test`s are catched by `if`s
- introduce LCOV_INCLUDE make variable, simple coverage for your extension:
  ./configure --enable-gcov && make lcov TESTS=~/src/pecl/http/test LCOV_INCLUDE=/http/
  coverage takes just a few seconds instead of a few minutes for the full source tree
 2012-01-23 09:48:18 +00:00
Stanislav Malyshev
cbdfc93154 back to dev 2012-01-19 06:29:15 +00:00
Stanislav Malyshev
44c773120e 5.4.0RC6 2012-01-19 06:27:56 +00:00
Johannes Schlüter
93ee94adb6 We should be back to -dev ... 2012-01-15 19:51:36 +00:00
Johannes Schlüter
3eb4b024ee PHP 5.3.9 2012-01-10 11:21:57 +00:00
Stanislav Malyshev
64a9019171 back to dev 2012-01-05 07:24:26 +00:00
Stanislav Malyshev
6cb0b66053 5.4.0rc5 2012-01-05 07:22:29 +00:00
Johannes Schlüter
af07705f97 Back to -dev 2011-12-22 12:36:40 +00:00
Johannes Schlüter
712be66d05 PHP 5.3.9RC4 2011-12-22 12:33:04 +00:00
Stanislav Malyshev
48a688ffa0 back to dev 2011-12-22 03:27:00 +00:00
Stanislav Malyshev
1a79692791 5.4.0rc4 2011-12-22 03:25:28 +00:00
Johannes Schlüter
451263f7d0 - Back to -dev 2011-12-08 13:46:45 +00:00
Johannes Schlüter
4307bd57db - 5.3.9RC3 2011-12-08 11:01:37 +00:00
Stanislav Malyshev
8559b09566 back to dev 2011-12-08 07:17:27 +00:00
Stanislav Malyshev
00f2a9b2ba 5.4.0rc3 2011-12-08 07:15:44 +00:00
Felipe Pena
37eba77f31 - Escape [ ] chars in the configure message 
Patch by: Daniel Convissor
 2011-12-01 16:40:07 +00:00
Felipe Pena
2b25c9377e - Escape [ ] chars in the configure message 
Patch by: Daniel Convissor
 2011-12-01 16:40:07 +00:00
Johannes Schlüter
fb573462ca - Back to -dev 2011-11-24 14:00:10 +00:00
Johannes Schlüter
e9087c9d4a - PHP 5.3.9RC2 2011-11-24 12:57:59 +00:00
Stanislav Malyshev
c05614fb6d back to dev 2011-11-24 05:04:25 +00:00
Stanislav Malyshev
953016b6b9 5.4.0RC2 2011-11-24 05:03:22 +00:00
Felipe Pena
3d19038838 - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs) 
patch by: klightspeed at netspace dot net dot au
 2011-11-15 20:33:26 +00:00
Felipe Pena
42776c0259 - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs) 
patch by: klightspeed at netspace dot net dot au
 2011-11-15 20:33:26 +00:00
Felipe Pena
8e6a9d469a - Fixed bug #55874 (GCC does not provide __sync_fetch_and_add on some archs) 
patch by: klightspeed at netspace dot net dot au
 2011-11-15 20:33:26 +00:00
Stanislav Malyshev
7f6c7422a8 back to dev 2011-11-10 06:27:37 +00:00
Stanislav Malyshev
07f2c01bd2 5.4.0 RC1 2011-11-10 06:26:25 +00:00
Johannes Schlüter
98dfe36852 Back to -dev 2011-11-03 15:26:34 +00:00
Johannes Schlüter
60937c2cf6 - PHP 5.3.9RC1 2011-11-03 15:08:19 +00:00