archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
103071 commits 526 branches 1434 tags 879 MiB
Commit graph

1683 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
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
Pierre Joye
45416cbe56 - update to openssl 0.9.8u 2012-04-02 13:06:44 +02:00
Pierre Joye
2c43149f21 - fix bug #61290, fix build 2012-03-05 20:53:40 +00:00
Pierre Joye
d1f7d3c8a9 - fix bug #61290, fix build 2012-03-05 20:53:40 +00: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
d54710ae2f - fix #60895, possible invalid handler usage 2012-01-27 10:56:33 +00:00
Pierre Joye
4879a01b54 - fix #60895, possible invalid handler usage 2012-01-27 10:56:33 +00:00
Pierre Joye
1e462057cd - fix #60895, possible invalid handler usage 2012-01-27 10:56:33 +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
Pierre Joye
612e73b00b - add new build type, optional. has been used for the last 2 RCs 2012-01-11 15:46:45 +00:00
Pierre Joye
92120997c9 - add new build type, optional. has been used for the last 2 RCs 2012-01-11 15:46:45 +00:00
Pierre Joye
96e02805fb - spl tests are also under examples (sigh) 2012-01-09 13:56:46 +00:00
Pierre Joye
7f2c8b347c - spl tests are also under examples (sigh) 2012-01-09 13:56:46 +00:00
Pierre Joye
f6a7b27198 - spl tests are also under examples (sigh) 2012-01-09 13:56:46 +00:00