Dmitry Stogov
243383a811
Fixed windows build
2014-08-14 23:31:01 +04:00
Dmitry Stogov
7497c8793d
Merge branch 'master' into phpng
...
* master: (51 commits)
Update Git rules
Back to -dev (with EOL notice in NEWS)
new NEWS block for the next release
It's 2014 already, fix copyright year where user visible
PHP 5.3.29
Some changes were lost in the merge commit of #66091
Updated NEWS for #66091
Fixed #66091
Updated NEWS for #66091
Updated NEWS for #66091
Fixed #66091
updated NEWS
updated NEWS
updated NEWS
backported the fix for bug #41577
NEWS entry for e6d93a1d73d44c#694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
PHP 5.3.29RC1
Fix missing type checks in various functions
...
Conflicts:
ext/date/php_date.c
ext/standard/math.c
2014-08-14 23:30:49 +04:00
Dmitry Stogov
773d80c6df
Fixed support for references
2014-08-14 22:44:25 +04:00
Dmitry Stogov
e7ffdb2654
Fixed support for references
2014-08-14 21:54:57 +04:00
Sara Golemon
37e91cc5d3
Merge branch 'pull-request/658'
2014-08-14 09:44:14 -07:00
Johannes Schlüter
e644e6634d
Merge branch 'PHP-5.6'
2014-08-14 17:27:12 +02:00
Johannes Schlüter
a68f63156c
Merge branch 'PHP-5.5' into PHP-5.6
2014-08-14 17:25:22 +02:00
Johannes Schlüter
d1dd71454d
Merge branch 'PHP-5.4' into PHP-5.5
2014-08-14 17:22:25 +02:00
Johannes Schlüter
aeb633543b
Merge branch 'PHP-5.3' into PHP-5.4
2014-08-14 17:13:44 +02:00
Johannes Schlüter
7311087cf0
Update Git rules
2014-08-14 17:08:02 +02:00
Johannes Schlüter
1355ea60cc
Back to -dev (with EOL notice in NEWS)
2014-08-14 17:05:20 +02:00
Dmitry Stogov
05ca575bbb
Fixed reference support (references to references are not allowed)
2014-08-14 17:00:01 +04:00
Dmitry Stogov
e430948581
Fixed reference handling
2014-08-14 15:07:39 +04:00
Dmitry Stogov
2ece977c80
Fixed conversion of empty packed array into hash
2014-08-14 13:44:37 +04:00
Dmitry Stogov
25bda5ae3c
Fixed assignment of reference to itself
2014-08-14 12:01:28 +04:00
Dmitry Stogov
753813e542
Restored "???" mark in the place that might be changed later
2014-08-14 10:46:17 +04:00
Xinchen Hui
f7f411e4e2
It's okey for use a stack value here (deleted immediately after use)
2014-08-14 12:26:45 +08:00
Xinchen Hui
c749fe2067
cleanup
2014-08-14 12:15:24 +08:00
Xinchen Hui
bfc1ae07be
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
2014-08-14 11:52:46 +08:00
Ferenc Kovacs
0bad99bf99
Merge branch 'PHP-5.6'
...
* PHP-5.6:
new NEWS block for the next release
2014-08-14 02:18:27 +02:00
Ferenc Kovacs
7c5af1adf9
new NEWS block for the next release
2014-08-14 02:17:55 +02:00
Dmitry Stogov
73fe418637
Avoid reallocation
2014-08-13 23:30:07 +04:00
Johannes Schlüter
babeca356b
It's 2014 already, fix copyright year where user visible
...
Left out all file headers
2014-08-13 21:22:50 +02:00
Dmitry Stogov
8296129e50
cleanuo (use zend_string instead of char*)
2014-08-13 22:26:07 +04:00
Dmitry Stogov
bb7d9005b5
cleanup
2014-08-13 22:21:51 +04:00
Dmitry Stogov
01c8aee7d2
cleanup
2014-08-13 22:18:05 +04:00
Johannes Schlüter
1847cf10c1
PHP 5.3.29
2014-08-13 18:36:10 +02:00
Dmitry Stogov
a08b7b7701
cleanup
2014-08-13 19:43:34 +04:00
Dmitry Stogov
c1c913c5f1
cleanup (we don't have to duplicate elements of module_registry)
2014-08-13 17:05:18 +04:00
Dmitry Stogov
b59cc8de23
cleanup (we don't have to duplicate elements of stream_filters_hash)
2014-08-13 17:00:13 +04:00
Tjerk Meesters
7fbc99e390
Some changes were lost in the merge commit of #66091
2014-08-13 20:57:10 +08:00
Dmitry Stogov
9fea4348fd
cleanup
2014-08-13 16:55:21 +04:00
Tjerk Meesters
e4905b38b7
Updated NEWS for #66091
2014-08-13 20:24:43 +08:00
Tjerk Meesters
4b85f1d46a
Fixed #66091
2014-08-13 20:24:43 +08:00
Tjerk Meesters
b695341e62
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS for #66091
Updated NEWS for #66091
Fixed #66091
2014-08-13 20:21:30 +08:00
Tjerk Meesters
4950209a74
Updated NEWS for #66091
2014-08-13 20:20:54 +08:00
Tjerk Meesters
4647016abe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Updated NEWS for #66091
Fixed #66091
Conflicts:
ext/date/php_date.c
2014-08-13 20:20:10 +08:00
Tjerk Meesters
b0f7cc8756
Updated NEWS for #66091
2014-08-13 20:16:22 +08:00
Tjerk Meesters
c5f619ba6f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed #66091
Conflicts:
ext/date/php_date.c
2014-08-13 20:15:52 +08:00
Tjerk Meesters
f6896e4395
Fixed #66091
2014-08-13 20:12:42 +08:00
Dmitry Stogov
5a06ac88da
cleanup (use zend_string* instead of char*)
2014-08-13 14:51:48 +04:00
Xinchen Hui
35dd200430
clean up - remove checked questions
2014-08-13 16:44:22 +08:00
Dmitry Stogov
b8517e410c
cleanup
2014-08-13 12:36:10 +04:00
Xinchen Hui
da3aeeed39
clean up - avoid realloc
2014-08-13 15:51:43 +08:00
Ferenc Kovacs
86aa8d2523
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS entry for e6d93a1d73d44c#694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
2014-08-12 14:48:48 +02:00
Ferenc Kovacs
844e2e81f5
Merge branch 'pr-765' into PHP-5.6
...
* pr-765:
NEWS entry for e6d93a1d73d44c#694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
2014-08-12 14:47:03 +02:00
Dmitry Stogov
05eaed4345
Merge branch 'master' into phpng
...
* master:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
2014-08-12 14:46:38 +04:00
Anatol Belski
91351d4bf5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
updated NEWS
updated NEWS
backported the fix for bug #41577
2014-08-12 11:53:10 +02:00
Anatol Belski
00fe640b19
updated NEWS
2014-08-12 11:52:50 +02:00
Anatol Belski
f50c50a1f8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
updated NEWS
backported the fix for bug #41577
2014-08-12 11:52:07 +02:00
