clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
76,029 Commits 494 Branches 1,367 Tags 803 MiB
b8f9a20286
Commit Graph

32635 Commits

Author SHA1 Message Date
datibbaw
b8f9a20286 added openssl_x509_digest(), output is binary sha1 2013-09-20 15:04:52 +08:00
Christopher Jones
b6d0cb0553 Build OCI8 2.0 on Windows with Oracle Database 12c libraries only 2013-09-18 19:50:32 -07:00
David Soria Parra
dc7015d4e4 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
 2013-09-18 15:06:58 +02:00
David Soria Parra
94e4c4df86 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
 2013-09-18 15:06:51 +02:00
David Soria Parra
7a24ee13ec Revert "EmptyIterator now implements Countable; fixes bug 60577" 
This reverts commit 8a936e8eb9.
 2013-09-18 15:06:36 +02:00
David Soria Parra
58c6e05748 Merge branch 'PHP-5.5' 
* PHP-5.5:
  RFC 6598 reserved ip range starts at 100.64.0.0
 2013-09-18 14:29:02 +02:00
David Soria Parra
2eb5661886 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  RFC 6598 reserved ip range starts at 100.64.0.0
 2013-09-18 14:28:57 +02:00
David Soria Parra
7e9044b6a2 RFC 6598 reserved ip range starts at 100.64.0.0 2013-09-18 14:27:58 +02:00
Michael Wallner
cdf5d201ab fix test concurrency 2013-09-18 11:02:45 +02:00
Michael Wallner
e9877fe92e fix test concurrency 2013-09-18 10:53:11 +02:00
Michael Wallner
14d5341787 fix test concurrency 2013-09-18 10:52:51 +02:00
Michael Wallner
6866b45a48 fix test concurrency 2013-09-18 10:52:35 +02:00
Michael Wallner
002763fb7b fix test concurrency 2013-09-18 10:52:18 +02:00
Michael Wallner
e6084da473 final bits 2013-09-17 13:59:49 +02:00
Michael Wallner
423c70fb4d Merge branch 'slim-postdata-merge' 
* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
	ext/soap/soap.c
	ext/standard/php_fopen_wrapper.c
	main/SAPI.c
 2013-09-17 13:52:25 +02:00
Michael Wallner
0f78d8612a we need to use the full stream wrapper for filters 2013-09-17 13:44:50 +02:00
Anatol Belski
41d78110ff let the libsqlite3 symbols be exported in dll 2013-09-17 13:05:44 +02:00
Michael Wallner
1c15d70cbd Merge branch 'slim-postdata' 
* slim-postdata:
  slim post data
  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.
 2013-09-17 10:50:49 +02:00
David Soria Parra
52ff129607 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
 2013-09-17 09:55:59 +02:00
David Soria Parra
5e3da04fb0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
 2013-09-17 09:55:03 +02:00
Sebastian Nohn
7c279df6ae Add RFC 6598 IPs to reserved addresses 
(cherry picked from commit b3f5b822e9)
 2013-09-17 09:52:53 +02:00
David Soria Parra
ca75e6f760 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-16 23:36:48 +02:00
David Soria Parra
3d6ac70e66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
 2013-09-16 23:36:37 +02:00
Michael Wallner
ca3d5d06e4 use 65k of data to get a more explicit result 2013-09-16 10:50:02 +02:00
Michael Wallner
52bd9f05ea this test is fragile on travis, let's see why 2013-09-16 09:29:42 +02:00
Xinchen Hui
743c680545 Merge branch 'PHP-5.5' 2013-09-16 15:03:09 +08:00
Xinchen Hui
1916aaa272 Add test for ISSUE #128 2013-09-16 14:58:18 +08:00
Xinchen Hui
e53e79c701 Merge branch 'PHP-5.5' 2013-09-16 14:43:13 +08:00
Xinchen Hui
46f18ccf0d Fixed bug #65665 (Exception not properly caught when opcache enabled) 2013-09-16 14:43:01 +08:00
Alex Bobrov
18b54a2366 Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names) 
(cherry picked from commit c149d4ee4be81ecf005eafd43ede06e70aa4c985)
 2013-09-16 05:23:52 +02:00
Levi Morrison
8a936e8eb9 EmptyIterator now implements Countable; fixes bug 60577 
(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
 2013-09-16 04:04:53 +02:00
Boro Sitnikovski
a475b2c1db Bug 64157 
Changed error message to make sense
 2013-09-16 03:42:49 +02:00
Nikita Popov
db6d93feca Remove some more unnecessary macros from phar 2013-09-13 21:49:09 +02:00
Nikita Popov
e6b228332f Remove PHAR_(Z)STR* usages 2013-09-13 21:49:09 +02:00
Nikita Popov
39bd738fbf Remove version checks in phar 
No need to keep around compatability code for PHP 5.0 and PHP 6.
 2013-09-13 21:47:59 +02:00
Michael Wallner
2e692b22e9 fix broken sha2 configure tests 
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
 2013-09-13 12:56:38 +02:00
Michael Wallner
9eaffd34c1 fix broken sha2 configure tests 
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
 2013-09-13 12:56:26 +02:00
Nikita Popov
5350b9957a Merge branch 'PHP-5.5' 2013-09-12 23:30:40 +02:00
Levi Morrison
d76959a3b9 Fixed minor bug in test. 2013-09-12 23:29:52 +02:00
Nikita Popov
64ee0cde5d Merge branch 'PHP-5.5' 2013-09-12 17:49:28 +02:00
Nikita Popov
ad976d8240 Fix bug #64782: SplFileObject constructor make $context optional 2013-09-12 17:46:14 +02:00
Popa Adrian Marius
074385cb33 Prepare pdo_firebird for a pecl release also 2013-09-12 17:47:05 +03:00
Nikita Popov
89d115264c Merge branch 'PHP-5.5' 2013-09-12 15:23:11 +02:00
Boro Sitnikovski
165f544ae9 Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime 
DateTimeImmutable::createFromFormat should call
date_create_immutable_from_format instead of date_create_from_format
 2013-09-12 15:21:45 +02:00
Nikita Popov
32437b945a Merge branch 'PHP-5.5' 2013-09-12 15:15:17 +02:00
Boro Sitnikovski
d7f5f1ef35 Fix bug #65548: Comparison for DateTimeImmutable doesn't work 2013-09-12 15:12:16 +02:00
Adam Harvey
8983a38d51 Request non-keep-alive connections by default in HTTP 1.1 requests. 
As noted in FR #65634, at present we don't send a Connection request header
when the protocol version is set to 1.1, which means that RFC-compliant Web
servers should respond with keep-alive connections. Since there's no way of
reusing the HTTP connection at present, this simply means that PHP will appear
to hang until the remote server hits its connection timeout, which may be quite
some time.

This commit sends a "Connection: close" header by default when HTTP 1.1 (or
later) is requested by the user via the context options. It can be overridden
by specifying a Connection header in the context options. It isn't possible to
disable sending of the Connection header, but given "Connection: keep-alive" is
the same as the default HTTP 1.1 behaviour, I don't see this as a significant
issue — users who want to opt in for that still can.

As a note, although I've removed an efree(protocol_version), this doesn't
result in a memory leak: protocol_version is freed in the out: block at the end
of the function anyway, and there are no returns between the removed efree()
and the later call. Yes, I ran the tests with valgrind to check that. ☺

Implements FR #65634 (HTTP wrapper is very slow with protocol_version 1.1).
 2013-09-11 14:11:29 -07:00
Adam Harvey
fba290c061 Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir. 
Newer versions of libcurl prevent file:// location response headers by default,
which means that the open_basedir check is unnecessary — the fact
CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled
means that there's no possibility of breaching the open_basedir restriction,
and this allows HTTP redirects to be followed automatically.

Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or
safe_mode).
 2013-09-10 11:42:42 -07:00
Michael Wallner
71bee63fad remove unused code 2013-09-10 13:16:24 +02:00
Michael Wallner
449d4c0b1c make reading php://input JIT if enable_post_data_reading=0 2013-09-10 13:13:33 +02:00