Anatol Belski
c675980046
Merge branch 'pull-request/500'
...
* pull-request/500:
limit virtual_cwd_activate() duplicated call to ZTS only
reverted the previous commit, both calls are needed in TS mode
virtual_cwd_activate() should be called only in one place
back to do_alloca()
removed unnecessary call
simplify the state free macros
compact the code to preserve the error info after state freeing
back to do_alloca(), reverted the wrong replacement
enabled windows to use stack in both ts/nts mode, some more fixes
moved to do_alloca() usage where appropriate
fixed invalid free
fixed virtual cwd header in phar
updated NEWS
fixed all the places where last error could be lost
preserve the error code
applied and fixed the original patch
initial move on renaming files and fixing includes
Conflicts:
ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
Anatol Belski
4295bfeeaf
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated libs_versions.txt
2013-10-29 13:35:38 +01:00
Anatol Belski
5f1cbfacf9
updated libs_versions.txt
2013-10-29 13:35:02 +01:00
Anatol Belski
e30b2aae5a
initial move on renaming files and fixing includes
2013-10-17 09:43:52 +02:00
Felipe Pena
eed5d9cc5f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed possible memory leak
2013-10-12 18:06:39 -03:00
Felipe Pena
62a8305007
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed possible memory leak
2013-10-12 18:06:27 -03:00
Felipe Pena
960b4e81f3
- Fixed possible memory leak
2013-10-12 18:06:20 -03:00
Anatol Belski
86dfe7be49
better way to fix PRIu64 availability on windows
2013-09-18 15:14:36 +02:00
Anatol Belski
82bb2a2535
Merge branch 'PHP-5.5'
...
* PHP-5.5:
removed the /Wp64 switch as we use true 64 bit compiler now
2013-08-28 15:10:42 +02:00
Anatol Belski
bd677b43a7
removed the /Wp64 switch as we use true 64 bit compiler now
2013-08-28 15:10:05 +02:00
Anatol Belski
3745bdadc0
updated lib versions
2013-08-28 14:43:00 +02:00
Anatol Belski
8cc1ee8c81
Merge branch 'PHP-5.5'
...
* PHP-5.5:
updated lib versions, the vc11 ones only matter now
2013-08-28 14:30:03 +02:00
Anatol Belski
51016262a7
updated lib versions, the vc11 ones only matter now
2013-08-28 14:25:39 +02:00
Anatol Belski
1673e8f67e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #65268 select() implementation uses outdated tick API
2013-07-18 18:02:26 +02:00
Anatol Belski
99afc6dc11
Fixed bug #65268 select() implementation uses outdated tick API
2013-07-18 18:01:51 +02:00
Stanislav Malyshev
e92a63c9ee
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove PWS (Personal Web Server) references
2013-07-15 00:38:50 -07:00
Bruno CHALOPIN
2ec7b1c388
Remove PWS (Personal Web Server) references
2013-07-15 00:38:29 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Anatol Belski
c7490a6edd
add usleep() to the header, already exported to dll
2013-07-10 16:16:33 +02:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Stanislav Malyshev
84e35fb2e0
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
typo fixes (argument)
typo fixes (accommodate, parameter)
2013-06-10 13:36:41 -07:00
Veres Lajos
ed2e84e239
typo fixes (accommodate, parameter)
2013-06-10 13:36:03 -07:00
Anatol Belski
e3aeb6c070
updated lib versions
2013-05-01 21:37:28 +02: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
f578bb0388
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:00:13 +02:00
Anatol Belski
ca425a67c4
updated lib versions
2013-04-17 13:20:23 +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
2e00f7611c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible precision loss in microtime
2013-03-23 17:48:05 +01: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
8aaa09636a
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
2013-03-11 16:04:37 +01:00
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
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
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