Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -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
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