Christopher Jones
759517651e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:47:42 -07:00
Christopher Jones
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
Christopher Jones
9d62807190
Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:45:06 -07:00
Stanislav Malyshev
4da6273092
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix CVE-2013-4073 - handling of certs with null bytes
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:26:32 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
2874696a5a
Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:20:33 -07:00
Christopher Jones
f95cd93408
Fix unused variable warning in OCI8 2.0
2013-08-13 15:15:57 -07:00
Anatol Belski
c5674bb502
Merge branch 'PHP-5.5'
...
* PHP-5.5:
removed unused vars
2013-08-12 15:53:34 +02:00
Anatol Belski
bab33f7e05
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed unused vars
2013-08-12 15:52:50 +02:00
Anatol Belski
72aacbf735
removed unused vars
2013-08-12 15:52:15 +02:00
Anatol Belski
42171b13f4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fixed strndup usage in the pgsql ext
2013-08-12 15:45:43 +02:00
Anatol Belski
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
Anatol Belski
4134ebec8e
fixed strndup usage in the pgsql ext
2013-08-12 15:44:47 +02:00
Anatol Belski
acea91b18c
Fixes to unified stdint usage
...
This recalls 14caf174ff
2013-08-12 13:39:17 +02:00
Yasuo Ohgaki
3ada3aaea6
Revise pgsql test files
2013-08-12 05:14:43 +09:00
Yasuo Ohgaki
727318546d
Revise pgsql test for Travis CI
2013-08-11 18:57:39 +09:00
Yasuo Ohgaki
713aedfe65
Add 00version.phpt to get server/protocol/client version. Revise test script description
2013-08-11 18:33:33 +09:00
Stanislav Malyshev
6c494edfb7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
ensure notices are not ignored when tests need them
2013-08-10 23:13:09 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
cf39c3d638
ensure notices are not ignored when tests need them
2013-08-10 23:12:04 -07:00
Stanislav Malyshev
d8a2779456
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
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.
Adds files: error 1 to 5 and variation 1 to 4
2013-08-10 18:03:07 -07:00
Antonio Diaz Ruiz
1a5c460ea2
Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
2013-08-10 18:02:08 -07:00
Antonio Diaz Ruiz
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
Antonio Diaz Ruiz
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
Stanislav Malyshev
3db907b803
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Add schema default/fixed value support
2013-08-10 17:56:46 -07:00
Stanislav Malyshev
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
Yasuo Ohgaki
0959475e11
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:44:01 +09:00
Yasuo Ohgaki
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
Yasuo Ohgaki
0ad81ac18a
Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:43:01 +09:00
Yasuo Ohgaki
771b06f585
Merge branch 'PHP-5.5'
...
* PHP-5.5:
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:30:05 +09:00
Yasuo Ohgaki
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
Yasuo Ohgaki
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
Yasuo Ohgaki
6941ce3583
Implemented Request #20421 (session_abort() and session_reset() function
2013-08-10 16:57:56 +09:00
Yasuo Ohgaki
54a42f0d0c
Implemented Request #11100 (session_gc() function).
2013-08-10 15:20:24 +09:00
Yasuo Ohgaki
f2b5725115
Remove compile warning of commit 554021d21e
2013-08-10 14:35:30 +09:00
Yasuo Ohgaki
554021d21e
Implemented Bug #17860 Suggestion: auto detect whether session changed
2013-08-10 13:56:32 +09:00
Yasuo Ohgaki
678ec30655
Implement Bug #54649 Create session_serializer_name()
2013-08-10 09:26:10 +09:00
Dmitry Stogov
2bc886abed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Replce ZEND_FETCH_* instructions with IS_CV if possible
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2013-08-09 17:52:22 +04:00
Dmitry Stogov
b27f6826d4
Replce ZEND_FETCH_* instructions with IS_CV if possible
2013-08-09 17:47:47 +04:00
Michael Wallner
7c3afd31f9
fix test
2013-08-09 13:30:29 +02:00
Michael Wallner
611122c22e
Merge branch '2Guploads'
...
* 2Guploads:
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
unify stdint type usage
2013-08-09 11:47:25 +02:00
Michael Wallner
5cea7a9047
fix bug #65391
...
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
2013-08-09 11:25:54 +02:00
Michael Wallner
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
Michael Wallner
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
Yasuo Ohgaki
b6b425d2cf
Fixed Bug #65315 session.hash_function silently fallback to default md5
2013-08-09 18:05:24 +09:00
Andrey Hristov
42dbc598dd
Merge branch 'PHP-5.5'
2013-08-08 13:53:08 +02:00
Andrey Hristov
82a7ec72de
add some tracing
2013-08-08 13:51:55 +02:00
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
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