Xinchen Hui
185e5e15ae
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
2013-04-04 19:28:17 +08:00
Xinchen Hui
4f2acd8cde
Update test script to make sure the error occurred
2013-04-04 14:55:17 +08:00
Xinchen Hui
846d298f9b
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 14:53:06 +08:00
Xinchen Hui
9883d8d3e5
no tab here
2013-04-04 14:52:59 +08:00
Xinchen Hui
934dfae4e1
no tab here
2013-04-04 14:52:27 +08:00
Xinchen Hui
82ac3106e0
Use 5.4 specifical warnnig & Update NEWs
2013-04-04 14:47:49 +08:00
Xinchen Hui
f4f8b5a94b
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 14:44:28 +08:00
Xinchen Hui
c96a5bc6be
Fixed bug #64578 (debug_backtrace in set_error_handler corrupts zend heap: segfault)
2013-04-04 14:34:11 +08:00
Xinchen Hui
db3d629f05
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-04 13:40:46 +08:00
Xinchen Hui
7fc8077e4c
Fixed Bug #64578
2013-04-04 13:40:21 +08:00
ptarjan
99ad08f9a5
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:27 +08:00
ptarjan
e8d80b770b
Fix #64572 : Clean up after the test
...
Lets not leave stuff lying around.
2013-04-03 18:50:18 +08:00
Xinchen Hui
e34767d426
format
2013-04-03 10:20:33 +08:00
Xinchen Hui
78a9489f6a
Use new constant replace ugly trick
2013-04-03 10:12:49 +08:00
Xinchen Hui
37b20a1bc2
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-04-03 10:11:33 +08:00
Xinchen Hui
d7f709a032
Add CURL_WRAPPERS_ENABLE constant
...
see http://news.php.net/php.internals/66871
2013-04-03 10:09:51 +08:00
Remi Collet
c51e32860a
NEW for #64565
2013-04-02 16:33:54 +02:00
Remi Collet
731a5c5104
keep previous test to avoid any behavior change
2013-04-02 16:31:36 +02:00
Remi Collet
8e8a75444c
fix comment
2013-04-02 16:24:00 +02:00
Remi Collet
6b4148bc97
Fixed Bug #64565 copy doesn't report failure on partial copy
...
_php_stream_copy_to_stream_ex, when mmap is possible, doesn't check
if actually written bytes match read bytes.
Fix this (paranoid check) to be consistent with non mmap mode
Seems hard to add a unit test, as this rely on a full filesystem.
2013-04-02 16:18:26 +02:00
Xinchen Hui
7b07d05917
Merge branch 'PHP-5.3' into PHP-5.4
2013-04-01 18:13:38 +08:00
Xinchen Hui
9456dac54e
Fix test
2013-04-01 18:12:16 +08:00
Xinchen Hui
72426a446d
Skip test when --with-curlwrappers enabled.
2013-03-31 21:22:48 +08:00
Sergey Akbarov
1d4fcdff9f
Fix bug #64433 : does not follow redirects for non-3xx response codes
2013-03-30 21:22:30 -07:00
Nikita Popov
92aa361bfc
Forgot to fix the test on 5.4
2013-03-28 18:42:01 +01:00
Nikita Popov
bbe9052ca3
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-28 18:41:34 +01:00
Nikita Popov
fecce5a55f
Exclude Travis build for 5.3 and 5.4
2013-03-28 18:40:57 +01:00
Xinchen Hui
ef93a93ee2
Attempt to fix SKIP
2013-03-28 23:22:20 +08:00
Johannes Schlüter
242d88c20c
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-28 15:08:30 +01:00
Johannes Schlüter
46ee57f2d7
This will PHP 5.3.25
2013-03-28 15:05:46 +01:00
Veres Lajos
124a867b6a
Typo fix (greater then => greater than)
2013-03-28 19:12:08 +08:00
Remi Collet
640e72ce91
With pkgconfig < 0.28 output is a single space
...
With pkgconfig = 0.28 output is an empty string,
This breaks the test on the 2 vars
Need to split when
LIB set (ex -lssl -lcrypto)
INC empty (because /usr/include used)
2013-03-28 10:22:20 +01:00
Xinchen Hui
ab089611e0
Fix test on Mac (\D shows up)
2013-03-28 14:34:08 +08:00
Xinchen Hui
55341ac0a8
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2013-03-28 13:54:04 +08:00
Xinchen Hui
467cd6a60f
Add test for #64529
2013-03-28 13:45:42 +08:00
Stanislav Malyshev
f982aaafa7
will be 5.4.15
2013-03-27 14:00:12 -07:00
Stanislav Malyshev
210d43d7a2
fix NEWS
2013-03-27 13:57:53 -07:00
Dmitry Stogov
85e5e60777
Fixed bug #64529 (Ran out of opcode space)
2013-03-28 00:03:40 +04:00
Xinchen Hui
1182a3356c
Update test script
2013-03-26 11:50:47 +08:00
Xinchen Hui
5e9377ebd5
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
2013-03-26 11:44:57 +08:00
Dmitry Stogov
e9f996c00d
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-03-25 15:23:49 +04:00
Dmitry Stogov
c4686b4de9
Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:07:27 +04:00
Johannes Schlüter
6f560b0487
Document embedded server options in manpage
2013-03-24 17:32:30 +01:00
Johannes Schlüter
de71f435d8
Merge branch 'PHP-5.3' into PHP-5.4
2013-03-24 17:32:00 +01:00
Johannes Schlüter
66682f5abe
It's 2013, even for a manpage
2013-03-24 17:31:29 +01:00
Pierre Joye
bb18fa448c
- add reminder for checking return values
2013-03-24 13:27:00 +01:00
Pierre Joye
3af4896837
- fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
...
Signed-off-by: Anatol Belski <ab@php.net>
2013-03-23 22:42:03 +01:00
Anatol Belski
04b492a5fe
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Reworked the changes for bug #64452
2013-03-23 20:59:47 +01:00
Anatol Belski
638c4b89b7
Reworked the changes for bug #64452
2013-03-23 20:57:59 +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