bd29ff7c38
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix for php bug #64802 includes test case
Conflicts:
ext/openssl/openssl.c
2013-08-18 15:45:17 -07:00
9973658a44
Fix for php bug #64802 includes test case
2013-08-18 15:42:37 -07:00
1794291ebe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use pkg-config to detect iodbc
2013-08-18 14:16:24 -07:00
a3fa25e857
Use pkg-config to detect iodbc
2013-08-18 14:16:17 -07:00
2ee7e122a7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add -P option to use the current binary
Create test to the extension xmlrpc
2013-08-18 14:09:19 -07:00
ac2d2b9b72
Create test to the extension xmlrpc
2013-08-18 13:59:39 -07:00
144eab0889
code related typo fixes
2013-08-18 13:46:32 -07:00
cd14de94d2
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:06:59 -07:00
39612afc72
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
9ad97cd489
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
2013-08-14 20:36:50 -07:00
8c61758dc7
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:46 -07:00
9d62807190
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:06 -07:00
2b9f5ac252
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:25:47 -07:00
2874696a5a
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:20:33 -07:00
bab33f7e05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed unused vars
2013-08-12 15:52:50 +02:00
72aacbf735
removed unused vars
2013-08-12 15:52:15 +02:00
87198989cd
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed strndup usage in the pgsql ext
2013-08-12 15:45:26 +02:00
4134ebec8e
fixed strndup usage in the pgsql ext
2013-08-12 15:44:47 +02:00
29f1aa2618
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
ensure notices are not ignored when tests need them
2013-08-10 23:12:51 -07:00
cf39c3d638
ensure notices are not ignored when tests need them
2013-08-10 23:12:04 -07:00
1a5c460ea2
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
2013-08-10 18:02:08 -07:00
5f5ff92bc0
Adds 2 new xml files which include the dtd path relative to the base directory for the php source code.
...
It fixs the fail on the load of the dtd in the tests modified by this commit.
2013-08-10 18:02:00 -07:00
24f36934ad
Adds files: error 1 to 5 and variation 1 to 4
...
tests for error1: not well formed xml
tests for error2: not well formed xml attribute without colon
tests for error2: not well formed xml, typo
tests for error4: wrong xml version
tests for error5: extra content at the end of the doc
tests libxml_dtd_load
tests libxml_dtd_valid
tests for libdtd_noerror
tests for LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS
the basic behavior
fix comments
2013-08-10 18:01:54 -07:00
473d66553d
Merge branch 'pull-request/325' into PHP-5.5
...
* pull-request/325:
Add schema default/fixed value support
2013-08-10 17:56:23 -07:00
2df95b1354
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:43:37 +09:00
0ad81ac18a
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:43:01 +09:00
9d95a1a7d1
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:29:29 +09:00
e9b128c1bf
Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:29:13 +09:00
b27f6826d4
Replce ZEND_FETCH_* instructions with IS_CV if possible
2013-08-09 17:47:47 +04:00
b33824bfea
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #65391
Update NEWS
2013-08-09 11:21:50 +02:00
ac28283beb
fix bug #65391
...
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
2013-08-09 11:14:04 +02:00
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
cabf38af6d
Merge branch 'PHP-5.4'
2013-08-05 17:23:00 +02:00
963c1be38d
Merge branch 'PHP-5.5'
2013-08-05 17:16:05 +02:00
cb8d1fc7f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:24:07 +09:00
f718684a6c
Fixed bug #62978 . pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:23:15 +09:00
6f73a0c00f
Merge branch 'pr368' into PHP-5.5
...
* pr368:
fix crash, enable session_id and fix test
Strict session. Detect session id collision
Strict session
2013-08-04 20:00:28 -07:00
7d3fa7d8b6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
First fixes for a 64bit compatible ftp extension
2013-08-04 19:36:01 -07:00
a93a462dce
First fixes for a 64bit compatible ftp extension
2013-08-04 19:31:30 -07:00
e4f9619fad
fix compiler warning, use longs for hashes
2013-08-04 18:04:45 -07:00
b80d73ce15
fix crash, enable session_id and fix test
2013-08-04 17:43:20 -07:00
82b0e8be99
Strict session. Detect session id collision
2013-08-04 16:36:53 -07:00
25e8fcc88f
Strict session
2013-08-04 16:36:45 -07:00
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
626d96ab6d
This doesn't fail in 5.5 anymore
2013-08-03 12:14:47 -04:00
f17f596b27
Merge commit 'a03f094' into PHP-5.5
...
* commit 'a03f094':
We shouldn't load any local ini files for these tests
2013-08-02 16:23:44 -04:00
a03f0943ca
We shouldn't load any local ini files for these tests
2013-08-02 16:23:18 -04:00
d24f31c65e
Merge commit 'd60e168' into PHP-5.5
...
* commit 'd60e168':
pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:13:03 -04:00
Stanislav Malyshev