Commit Graph

69755 Commits

Author SHA1 Message Date
Xinchen Hui
d7f709a032 Add CURL_WRAPPERS_ENABLE constant
see http://news.php.net/php.internals/66871
2013-04-03 10:09:51 +08: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
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
Xinchen Hui
39a173b79b Fix bug in reflectionClass relate to #64239 2013-03-21 21:32:06 +08:00
Xinchen Hui
7dce0194c8 Fixed bug #64239 (Debug backtrace changed behavior since 5.4.10 or 5.4.11) 2013-03-21 21:09:30 +08:00
Xinchen Hui
08624ea90d Fix test after f8b91d9acf 2013-03-21 15:57:21 +08:00
Xinchen Hui
0fd3572f4e Fixed bug #64432 (more empty delimiter warning in strX methods) 2013-03-21 11:14:10 +08:00
Anatol Belski
0881ff0466 updated NEWS 2013-03-20 09:13:13 +01:00
Anatol Belski
06a526be3e Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:12:33 +01:00
Anatol Belski
bb935ff8dc Fixed bug #64452 Zip PHPTs crash intermittently 2013-03-20 09:10:10 +01:00
Anatol Belski
cfd096fd7c Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Backported fix for bug #62852
2013-03-19 21:22:09 +01:00
Anatol Belski
8d199c7c4f Backported fix for bug #62852 2013-03-19 21:19:55 +01:00
Carson McDonald
c6f6bf88d8 Fix typos 2013-03-19 15:11:34 +01:00
Anatol Belski
7687b8b81c fix C90 compat 2013-03-19 14:42:18 +01:00
Dmitry Stogov
7b0993bfb4 Fixed bug #63976 (Parent class incorrectly using child constant in class property) 2013-03-19 16:59:01 +04:00
Dmitry Stogov
984561cfa8 Partial fix for bug #64239 2013-03-19 15:45:48 +04:00
Dmitry Stogov
84630a1109 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 14:59:08 +04:00
Dmitry Stogov
4a6291508d Fixed bug #62343 (Show class_alias In get_declared_classes()) 2013-03-19 14:56:53 +04:00
Dmitry Stogov
e62bb03257 Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error) 2013-03-19 12:48:23 +04:00
Stanislav Malyshev
e25b2d7ea5 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  fix NEWS
2013-03-18 00:52:27 -07:00
Stanislav Malyshev
87c8ea15f2 fix NEWS 2013-03-18 00:52:15 -07:00