Commit Graph

80596 Commits

Author SHA1 Message Date
Bob Weinand
eeafa4e518 Merge branch 'master' into xml-protocol 2014-10-09 12:01:43 +02:00
Bob Weinand
ca7f2f5f43 Ports are unsigned short, use unsigned to display 2014-10-09 12:01:25 +02:00
Bob Weinand
b426897c9c Fix regression in list
It showed the entire remaining file before...
2014-10-09 11:52:57 +02:00
Bob Weinand
96de7c4b0a Reduce variabledetails+variable to just one variable tag 2014-10-09 11:47:52 +02:00
Tjerk Meesters
72bd28a5da Updated NEWS for #67949 2014-10-09 16:18:14 +08:00
Tjerk Meesters
8a3b41cd39 Merge branch 'pr/846' into PHP-5.6
* pr/846:
  DOMNodeList elements are accessible through array notation
2014-10-09 15:55:10 +08:00
Tjerk Meesters
cac55bad1a Updated NEWS for #68129 2014-10-09 08:24:30 +08:00
Tjerk Meesters
f92c9b3ced Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS for #68129
  Fixed bug #68129
2014-10-09 08:24:05 +08:00
Tjerk Meesters
061cb9b807 Updated NEWS for #68129 2014-10-09 08:23:42 +08:00
Tjerk Meesters
d0e51f5ce9 Fixed bug #68129
Empty usernames and passwords are now treated differently from no username or password

For example, empty password:

    ftp://user:@example.org

Empty username:

    ftp://:password@example.org

Empty username and empty password

    ftp://:@example.org
2014-10-09 08:21:30 +08:00
Bob Weinand
9db6a93b69 Add <intros> tag around <intro /> tags 2014-10-09 00:25:25 +02:00
Bob Weinand
07bbe62742 Put stack_verify in error buffer too 2014-10-08 23:44:22 +02:00
Bob Weinand
fa89d8b3f9 Fix escaping of < 2014-10-08 23:42:20 +02:00
Dmitry Stogov
aec519199b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added info about ext/opcache
2014-10-08 21:49:53 +04:00
Dmitry Stogov
09f9403a6e Added info about ext/opcache 2014-10-08 21:48:44 +04:00
Bob Weinand
0ef8b4caf3 Revert WS change from "[\r\n\t ]+" to "[\t ]+" 2014-10-08 00:35:17 +02:00
Bob Weinand
89a0d3c2b2 Merge branch 'master' into xml-protocol
Conflicts:
	phpdbg_lexer.c
	phpdbg_prompt.c
2014-10-08 00:27:12 +02:00
Bob Weinand
eabcdb2eb2 Fix bug which causes inf loop on \r\n 2014-10-08 00:15:21 +02:00
Keyur Govande
3bd8ac6710 Add to NEWS 2014-10-07 21:22:54 +00:00
Keyur Govande
92f108801e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add to NEWS
  Fix for bug #68087 (ODBC not reading DATE columns correctly)
2014-10-07 21:22:07 +00:00
Keyur Govande
d319a0c1d8 Add to NEWS 2014-10-07 21:21:23 +00:00
Keyur Govande
df9078ea55 Fix for bug #68087 (ODBC not reading DATE columns correctly)
Temporary variable indicating column field type ID should be
reset to default for loop iteration (i.e. every column in the
record set. The old buggy code made it persist across all columns
leading to invalid reads from the buffer, if for example a DATE
column was preceded by a VARCHAR column.
2014-10-07 21:17:36 +00:00
Keyur Govande
6f634ebb8c Add to NEWS 2014-10-07 21:09:47 +00:00
Keyur Govande
bcda6c9392 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add to NEWS
  Fix for bug #68114 (Build fails on OS X due to undefined symbols)
2014-10-07 21:08:18 +00:00
Keyur Govande
d21602c072 Add to NEWS 2014-10-07 21:07:19 +00:00
Keyur Govande
648673bffe Fix for bug #68114 (Build fails on OS X due to undefined symbols)
gcc (i686-apple-darwin10-gcc-4.2.1) on OS X cannot link fixed-width
decimals and fails with undefined symbols errors like ___extendsddf.
If configure used gcc for compiling it would notice and mark the
feature HAVE_DECIMAL_FP_SUPPORT as unsupported.
But configure seems to use cc (i686-apple-darwin10-llvm-gcc-4.2)
instead, which doesn't support fixed-width decimals either, but the
code compiles and links just fine. I suspect it may have something
to do with the llvm backend printed in the version.
Lacking the time to debug this further, the patch fixes the issue by
checking the expected output when fixed-width decimal support is
present and correctly implemented.
2014-10-07 20:58:43 +00:00
Leigh
106fab00bc Upated NEWS 2014-10-07 14:28:02 +01:00
Leigh
aa679295e4 Merge branch 'PHP-5.6' of https://github.com/php/php-src into gmp-random 2014-10-07 14:25:44 +01:00
krakjoe
4b3a11debb make build work moar 2014-10-07 12:36:03 +01:00
Bob Weinand
8bc2881260 Merge branch 'master' into xml-protocol
Conflicts:
	phpdbg.c
	phpdbg.h
	phpdbg_cmd.c
	phpdbg_cmd.h
	phpdbg_frame.c
	phpdbg_info.c
	phpdbg_list.c
	phpdbg_print.c
	phpdbg_prompt.c
	phpdbg_utils.c
	phpdbg_utils.h
	phpdbg_watch.c
2014-10-07 13:08:30 +02:00
krakjoe
f545ef48eb fix case insensitivity for registered functions 2014-10-07 11:30:26 +01:00
krakjoe
556ed2d3f4 fix mistake in help 2014-10-07 10:28:21 +01:00
Bob Weinand
6f584e22fe Merge branch 'webdata_transfer' 2014-10-07 00:45:29 +02:00
Bob Weinand
2422c70c4f &quot; => &amp;quot; in md document 2014-10-06 22:34:41 +02:00
Bob Weinand
699497e99f Add request id to <backtrace> 2014-10-06 13:20:04 +02:00
Bob Weinand
abd75ea2c5 Fix frames output 2014-10-06 11:46:39 +02:00
Bob Weinand
fb76316819 Add request_id possibility for xml output 2014-10-06 11:26:08 +02:00
Bob Weinand
8b6d707df0 Use PHP 5.4 compatible zend_execute in #if 2014-10-05 13:57:35 +02:00
Bob Weinand
2f6317c483 Fix infinite recursion issues (segfaults) 2014-10-05 13:33:31 +02:00
Bob Weinand
38e981bbdc Fix infinite recursion issues (segfaults) 2014-10-05 13:29:56 +02:00
Bob Weinand
bedd503c3f Consistency in breakpoint tags, <run> => <stop> 2014-10-05 12:33:24 +02:00
Bob Weinand
9cc73b5c75 Fix precision handling in strings 2014-10-05 11:57:14 +02:00
Bob Weinand
c55dbad546 Disable automatic resetting of imported auto_globals 2014-10-05 02:27:51 +02:00
Bob Weinand
f48fc67c86 Fix (system) ini entry transfer 2014-10-05 00:16:19 +02:00
Bob Weinand
62465b6d82 Fix issues with path names and cwd 2014-10-04 23:30:57 +02:00
Bob Weinand
19cdad194b Add transfer of output back to webserver and merge master in
Conflicts:
	config.m4
	phpdbg.c
	phpdbg.h
	phpdbg_cmd.c
	phpdbg_prompt.c
2014-10-04 23:21:34 +02:00
Johannes Schlüter
79ca53b62b Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 20:06:44 +02:00
Johannes Schlüter
b386991471 Fix accidental edit in previous commit 2014-10-04 20:06:02 +02:00
Johannes Schlüter
61d29990b4 Merge branch 'PHP-5.5' into PHP-5.6 2014-10-04 20:00:10 +02:00
Johannes Schlüter
136dd53ac2 Fix arginfo 2014-10-04 19:59:21 +02:00