1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Commit Graph

449 Commits

Author SHA1 Message Date
Xinchen Hui a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Sebastian Bergmann eab14993fe Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files. 2012-12-06 09:28:35 +01:00
Anatoliy Belsky a9d727e180 Merge branch 'PHP-5.4'
* PHP-5.4:
  updated lib versions
  Fix folding
2012-09-21 09:59:01 +02:00
Anatoliy Belsky 6c1f5eb215 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated lib versions
2012-09-21 09:58:16 +02:00
Anatoliy Belsky d59c1371c2 updated lib versions 2012-09-21 09:57:22 +02:00
Anatoliy Belsky 7be5e7539c Merge branch 'PHP-5.4'
* PHP-5.4:
  updated libary versions
2012-09-18 10:20:47 +02:00
Anatoliy Belsky 1e1db9d9bb Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  updated libary versions

Conflicts:
	win32/build/libs_version.txt
2012-09-18 10:20:05 +02:00
Anatoliy Belsky 6752f38ccc updated libary versions 2012-09-18 10:18:26 +02:00
unknown 80a2f2f68e Merge branch 'PHP-5.4'
* PHP-5.4:
  -enable VC11 (vc2012)
2012-09-08 18:48:32 +02:00
unknown cea7f09043 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  -enable VC11 (vc2012)
2012-09-08 18:47:32 +02:00
unknown dabe89c6f3 -enable VC11 (vc2012) 2012-09-08 18:46:33 +02:00
Xinchen Hui 63d9c1f40b Merge branch 'PHP-5.4'
Conflicts:
	sapi/litespeed/lsapi_main.c
2012-09-05 23:20:42 +08:00
Xinchen Hui 9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	ext/interbase/interbase.rc
2012-09-05 23:11:19 +08:00
Xinchen Hui d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Gustavo Lopes 53351d087d Merge branch 'generators'
* generators: (70 commits)
  Fix typos
  Fix segfault when traversing a by-ref generator twice
  Make sure that exception is thrown on rewind() after closing too
  Remove implementation stubs for yield delegation
  Fix several issues and allow rewind only at/before first yield
  Run finally if generator is closed before finishing
  Finally with return now works in generators too
  Add dedicated opcode for returns from a generator
  Disallow serialization and unserialization
  Fix zts build (typo)
  Drop Generator::close() method
  Forgot to add test
  Support trivial finally in generators (no yield, no return)
  Fix implementation of Iterator interface
  Add T_YIELD in tokenizer_data.c
  Throw error also for return occuring before yield
  Fix throwing of exceptions within a generator
  Remove reference restrictions from foreach
  Require parenthesis around yield expressions
  Add some more tests
  ...
2012-09-01 19:07:20 +02:00
Anatoliy Belsky 747d2f8417 Merge branch 'PHP-5.4'
* PHP-5.4:
  updated mpir version
  Fixed defective cloning in ext/intl classes
2012-08-29 17:56:42 +02:00
Anatoliy Belsky 677de8568a updated mpir version 2012-08-29 17:49:02 +02: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
Anatoliy Belsky 257d0b5566 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
2012-05-11 14:39:29 +02:00
Anatoliy Belsky 4458f3bcf6 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
2012-05-11 14:38:43 +02:00
Anatoliy Belsky 81ba6b14c7 Fix bug #61990 ext\spl\examples\tests\dualiterator_001.phpt fails
This fixes a general issue. In this ticket and not for the first time
is being seen, that people are trying to use data from "examples"
in the tests. When extracting a test pack only "tests" and its siblings
was taken into account. Now "examples" are copied as well.
2012-05-11 14:24:12 +02:00
Johannes Schlüter c62a41860e Merge branch 'PHP-5.4'
* PHP-5.4:
  Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:31:29 +02:00
Johannes Schlüter 6ecac26972 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:31:00 +02:00
Johannes Schlüter 21d314a767 Rename README.SVN-RULES to README.GIT-RULES, here, too 2012-04-14 00:29:55 +02:00
Pierre Joye 69e0e03457 - update to openssl 0.9.8u 2012-04-02 13:09:19 +02:00
Pierre Joye 55a6f3a12d - update to openssl 0.9.8u 2012-04-02 13:07:59 +02:00
Pierre Joye 45416cbe56 - update to openssl 0.9.8u 2012-04-02 13:06:44 +02:00
Pierre Joye 3a24a0b76e - fix bug #54407, Incorrectly defined NTDDI_VERSION macro 2012-03-04 22:15:12 +00:00
Pierre Joye ad8474c578 - fix bug #54407, Incorrectly defined NTDDI_VERSION macro 2012-03-04 22:15:12 +00:00
Pierre Joye d85cc4a1a1 - fix bug #54407, Incorrectly defined NTDDI_VERSION macro 2012-03-04 15:23:24 +00:00
Pierre Joye bda5ea7111 - fix bug #54407, Incorrectly defined NTDDI_VERSION macro 2012-03-04 15:23:24 +00:00
Pierre Joye 94994104a5 - bump minimum version, no more XP/2003 2012-03-04 15:08:12 +00:00
Pierre Joye e31a457c72 - libssh2 1.3.0 2012-01-30 11:04:19 +00:00
Pierre Joye 90321eaa98 - libssh2 1.3.0 2012-01-30 11:04:19 +00:00
Pierre Joye 7053fe29ea - libssh2 1.3.0 2012-01-30 11:04:19 +00:00
Pierre Joye 614c22e105 - update libs 2012-01-27 17:35:01 +00:00
Pierre Joye f75f11857c - update libs 2012-01-27 17:35:01 +00:00
Pierre Joye 544e36dfff - update libs 2012-01-27 17:35:01 +00:00
Pierre Joye 499bb11887 - update libs 2012-01-27 17:31:17 +00:00
Pierre Joye 9c948ad564 - update libs 2012-01-27 17:31:17 +00:00
Pierre Joye 52697bcfd3 - update libs 2012-01-27 17:31:17 +00:00
Pierre Joye 7e865a1555 - update libs 2012-01-27 13:27:03 +00:00
Pierre Joye 2e1e20b69b - update libs 2012-01-27 13:27:03 +00:00
Pierre Joye d762f04dd8 - update libs 2012-01-27 13:27:03 +00:00
Pierre Joye 07cf07df61 - openssl 0.9.8t, curl 7.24.0 2012-01-26 12:11:02 +00:00
Pierre Joye d997e578b7 - openssl 0.9.8t, curl 7.24.0 2012-01-26 12:11:02 +00:00
Pierre Joye 9fa30bf52b - openssl 0.9.8t, curl 7.24.0 2012-01-26 12:11:02 +00:00
Pierre Joye 993992d6db - add new build type, optional. has been used for the last 2 RCs 2012-01-11 15:47:37 +00:00