Commit Graph

1015 Commits

Author SHA1 Message Date
Ralph Schindler
ac73ca6db4 Fix for https://bugs.php.net/bug.php?id=62649 2013-03-07 23:20:11 +01:00
Anatol Belski
22ae9efe6e added back the older vc9 favours 2013-02-21 10:59:50 +01:00
Anatol Belski
27f8944eaa updated lib versions 2013-02-21 10:32:56 +01:00
Gustavo Lopes
8561680533 Remove some pre-vista code 2013-02-02 16:38:09 +01:00
Dmitry Stogov
52dd0d1c73 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:37 +04:00
Dmitry Stogov
046ae2f77c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:19 +04:00
Dmitry Stogov
e1410b5a70 Fixed uninitialized zval.type (Yoram) 2013-01-10 18:53:10 +04:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +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
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
75a2c0d715 Merge branch 'PHP-5.4' 2012-10-09 13:30:22 +08: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
Felipe Pena
5e51209785 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
2012-08-30 09:32:34 -03:00
Felipe Pena
eb8d603d46 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
2012-08-30 09:32:26 -03:00
Felipe Pena
de884997e0 - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry) 2012-08-30 09:32:13 -03: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
Xinchen Hui
07d0eab204 Merge branch 'PHP-5.4'
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (2) and Xinchen Hui (2)
* PHP-5.4:
  Remove unused codes
  based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
  merge 5.3 entries
  restore NEWS
  Fix ext/intl build on ICU < 4.8
  Optimization in ext/intl/msgformat
  Fixed tests in ext/intl
  Changed XFAILed collator_get_sort_key.phpt
2012-06-07 14:42:35 +08:00
Xinchen Hui
83542dcf3b Merge branch 'PHP-5.3' into PHP-5.4
By Gustavo André dos Santos Lopes (4) and others
via Felipe Pena (1) and Xinchen Hui (1)
* PHP-5.3:
  Remove unused codes
  based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
  Fix ext/intl build on ICU < 4.8
  Optimization in ext/intl/msgformat
  Fixed tests in ext/intl
  Changed XFAILed collator_get_sort_key.phpt
2012-06-07 14:32:47 +08:00
Xinchen Hui
6ecc9f1d9d Remove unused codes 2012-06-07 14:31:35 +08:00
slayercat
d9810af45a based on microsoft's description,the direct convert from FILETIME struct to __int64 is unsafe.
via http://technet.microsoft.com/en-us/library/ms724284(v=vs.85).aspx

"Do not cast a pointer to a FILETIME structure to either a
ULARGE_INTEGER* or __int64* value because it can cause alignment faults on 64-bit Windows."
2012-06-07 14:28:05 +08:00
Nikita Popov
ca59e5464d Add empty Generator class 2012-05-20 00:03:27 +02:00
Felipe Pena
42faa077f9 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #55299 (multiple null pointer in win32/registry.c)
2012-05-16 08:40:53 -03:00
Felipe Pena
1abcd81872 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - Fixed bug #55299 (multiple null pointer in win32/registry.c)
2012-05-16 08:40:45 -03:00
Felipe Pena
93c91c733c - Fixed bug #55299 (multiple null pointer in win32/registry.c) 2012-05-16 08:40:12 -03: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