Stanislav Malyshev
626effcf17
typo
2012-07-15 15:35:16 -07:00
Xinchen Hui
6d10bdff9f
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Update libmagic.patch
2012-07-15 18:27:29 +08:00
Xinchen Hui
c8f285d190
Update libmagic.patch
2012-07-15 18:25:58 +08:00
Stanislav Malyshev
026c161caf
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Implemented FR #61602 Allow access to name of constant used as default value
2012-07-14 23:10:00 -07:00
Stanislav Malyshev
f4809424cd
Merge branch 'pull-request/96' into PHP-5.4
...
* pull-request/96:
Implemented FR #61602 Allow access to name of constant used as default value
2012-07-14 23:08:50 -07:00
Stanislav Malyshev
1910fcff1e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
update NEWS
2012-07-14 22:41:18 -07:00
Stanislav Malyshev
55dbd8cf46
update NEWS
2012-07-14 22:41:08 -07:00
Stanislav Malyshev
e84c5be631
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
2012-07-14 22:35:47 -07:00
Stanislav Malyshev
a5d45bae85
Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
2012-07-14 22:34:28 -07:00
Stanislav Malyshev
05f4e3e52a
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Typofix in test-description
2012-07-14 22:08:27 -07:00
Stanislav Malyshev
cfdccdb805
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Typofix in test-description
2012-07-14 22:08:19 -07:00
Jille Timmermans
86b4252c8e
Typofix in test-description
2012-07-14 22:07:50 -07:00
Stanislav Malyshev
efdb7ce4b0
improve code in zend_operators
2012-07-14 21:06:40 -07:00
Stanislav Malyshev
455f3de802
Merge branch 'PHP-5.4'
...
* PHP-5.4:
removed unneccesary arrat and ini settings
addition SplFileObject tests
new tests from PHP TestFest June 2012
2012-07-14 19:25:16 -07:00
donnut
53ba768ed8
removed unneccesary arrat and ini settings
2012-07-14 19:22:03 -07:00
donnut
4539d799bb
addition SplFileObject tests
2012-07-14 19:21:50 -07:00
donnut
2cb7a678a1
new tests from PHP TestFest June 2012
2012-07-14 19:21:34 -07:00
Stanislav Malyshev
6bfea28ce3
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixing up closing tag
Testing variation on input parameters of http_build_query() function
2012-07-14 19:00:35 -07:00
Adam Gegotek
8b70dd202a
Fixing up closing tag
2012-07-14 18:59:04 -07:00
Adam Gegotek
152f73f92a
Testing variation on input parameters of http_build_query() function
2012-07-14 18:58:52 -07:00
Stanislav Malyshev
bbb5eba871
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:53:30 -07:00
Stanislav Malyshev
1916bb223e
Merge branch 'pull-request/91' into PHP-5.4
...
* pull-request/91:
Fixed bug #61964 (finfo_open with directory cause invalid free)
2012-07-14 18:52:24 -07:00
Stanislav Malyshev
bd340b7296
add NEWS/UPGRADING
2012-07-14 15:03:51 -07:00
Stanislav Malyshev
3b0573363a
fix comment
2012-07-14 14:50:50 -07:00
Stanislav Malyshev
c164e6b5a3
add test
2012-07-14 14:50:50 -07:00
Stanislav Malyshev
582514d4c7
fix for bug#18556 - use simple tolower() function for internal things
2012-07-14 14:50:50 -07:00
Felipe Pena
d2beb0fc05
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #62525 (sigabrt while converting floating point to string)
2012-07-14 15:15:42 -03:00
Felipe Pena
3728e50e9f
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #62525 (sigabrt while converting floating point to string)
2012-07-14 15:15:24 -03:00
Felipe Pena
63f3962a90
- Fixed bug #62525 (sigabrt while converting floating point to string)
2012-07-14 15:15:11 -03:00
Felipe Pena
c481a21ea1
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed memory leak when extending DOMXPath
- BFN
2012-07-14 13:17:09 -03:00
Felipe Pena
d640e446ab
- Fixed conflict
2012-07-14 13:16:35 -03:00
Felipe Pena
864575251a
- Fixed memory leak when extending DOMXPath
2012-07-14 13:13:31 -03:00
Felipe Pena
9c28393067
- BFN
2012-07-14 12:27:44 -03:00
Felipe Pena
f94051ea11
- Fix conflict
2012-07-14 12:23:24 -03:00
Felipe Pena
0bff7cfadd
- Fixed bug #62565 (Crashes due non-initialized internal properties_table)
2012-07-14 12:16:16 -03:00
Felipe Pena
44cdcb7fdb
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
2012-07-14 11:37:20 -03:00
Felipe Pena
8b093dee21
- Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
2012-07-14 11:37:08 -03:00
Anatoliy Belsky
afba8b6597
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62379 failing ODBC long column functionality
2012-07-13 15:38:38 +02:00
Matt Ficken
10251b20c3
Fixed bug #62379 failing ODBC long column functionality
2012-07-13 15:34:00 +02:00
Anatoliy Belsky
92bf6391aa
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
2012-07-13 11:46:49 +02:00
Anatoliy Belsky
d9d21b2037
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
2012-07-13 11:46:14 +02:00
Anatoliy Belsky
02b8362ec2
Fixed bug #61677 ext\zlib\tests\bug_52944.phpt fails
...
The test is known to fail on windows with zlib version < 1.2.7 (current dep is 1.2.5),
with 1.2.7 it works. As it's primarily a zlib 1.2.5 issue on windows, skip it for now.
2012-07-13 11:39:57 +02:00
Anatoliy Belsky
9cfb176116
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fixed the test for warnings changed
2012-07-12 18:30:09 +02:00
Anatoliy Belsky
cf91b163e1
fixed the test for warnings changed
2012-07-12 18:24:38 +02:00
Anatoliy Belsky
ed1f5b4dae
Merge branch 'PHP-5.4'
...
* PHP-5.4:
reverted news about #62477
reverted changes for #62477
Conflicts:
NEWS
2012-07-12 11:02:33 +02:00
Anatoliy Belsky
ec7e479562
reverted news about #62477
2012-07-12 10:57:56 +02:00
Anatoliy Belsky
86428169d3
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
reverted changes for #62477
2012-07-12 10:57:26 +02:00
Anatoliy Belsky
ad7eeba3c1
reverted changes for #62477
2012-07-12 10:54:14 +02:00
Anatoliy Belsky
7bd3d0bf8c
Merge branch 'PHP-5.4'
...
* PHP-5.4:
updated NEWS
2012-07-11 22:38:38 +02:00
Anatoliy Belsky
be8f089a13
updated NEWS
2012-07-11 22:37:39 +02:00
