Commit Graph

981 Commits

Author SHA1 Message Date
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Veres Lajos
ed2e84e239 typo fixes (accommodate, parameter) 2013-06-10 13:36:03 -07:00
Anatol Belski
8febe2ad08 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed stream_socket_pair() on Windows x64 and
2013-04-22 18:59:11 +02:00
Anatol Belski
f082d6311b Fixed stream_socket_pair() on Windows x64 and
improved errorhandling in the socketpair() implementation.
2013-04-22 18:55:32 +02:00
Anatol Belski
fb955a613c updated lib versions 2013-04-17 13:17:32 +02:00
Anatol Belski
4fbe1173eb fixed EOL 2013-04-17 13:15:08 +02:00
Anatol Belski
323fdb9879 updated lib versions 2013-04-17 13:12:18 +02:00
Anatol Belski
3654ff7366 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed possible precision loss in microtime
2013-03-23 17:47:39 +01:00
Anatol Belski
b022e54bd1 Fixed possible precision loss in microtime
This is related to the fix for bug #64370. MSVC natively supports __int64 type,
so calculating with 32 bit ints is neither necessary nor reliable. Therefore
an older piece of code is reused.
2013-03-23 17:40:06 +01:00
Anatol Belski
90c8f16c3b Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported patch for #64370
2013-03-15 19:08:32 +01:00
Anatol Belski
b903d2d6cd Backported patch for #64370 2013-03-15 19:04:40 +01:00
Anatol Belski
bae95bd9d4 updated lib versions 2013-02-21 10:27:37 +01:00
Anatol Belski
81e9aa6c8d updated lib versions 2013-02-21 09:46:50 +01: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
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
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
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
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
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
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
677de8568a updated mpir version 2012-08-29 17:49:02 +02: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
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
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
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
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
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
614c22e105 - update libs 2012-01-27 17:35:01 +00:00
Pierre Joye
f75f11857c - update libs 2012-01-27 17:35:01 +00:00