clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-30 22:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
90,996 Commits 494 Branches 1,367 Tags 797 MiB
4fe8d629d0
Commit Graph

9648 Commits

Author SHA1 Message Date
Anatol Belski
4fe8d629d0 fix test for systems with lower time resolution 2015-07-02 14:23:04 +02:00
Anatol Belski
8fed210610 remove stderr descriptor 2015-07-02 14:23:03 +02:00
Anatol Belski
afd8ebca78 no need to fflush here 2015-07-02 14:23:02 +02:00
Anatol Belski
5750058ddb added test for bug #69900 2015-07-02 14:23:01 +02:00
Anatol Belski
aec332e6b4 select the case to set the pipe blocking option more precisely 2015-07-02 14:23:00 +02:00
Anatol Belski
d516a14fb9 properly set the pipe blocking option 2015-07-02 14:22:57 +02:00
Anatol Belski
734d907aa4 initial stuff to make allow blocking pipes on windows 2015-07-02 14:22:55 +02:00
Xinchen Hui
72b0627315 Fixed bug #69521 (Segfault in gc_collect_cycles()). 2015-07-02 18:43:06 +08:00
Xinchen Hui
70d7ecfec6 Use zend_string in setcookie (save value reallocated) 2015-07-02 12:04:28 +08:00
Xinchen Hui
017d3530f3 Unnecessary duplication 2015-07-02 11:47:22 +08:00
Xinchen Hui
fc58025627 This can not be true 2015-07-02 11:04:24 +08:00
Bob Weinand
007d7ac7ca Use DivisionByZeroError instead of exception for %/intdiv() 2015-07-02 02:20:58 +02:00
Christoph M. Becker
e49922d3f8 Fix #69976: Unable to parse "all" urls with colon char 
If a colon occurs in a query string or fragment of a partial URL without
scheme, parse_url() tries to regard it as port separator. If up to 5 digits
follow and then a slash or the end of the string, parse_url() fails.

We're fixing this by checking whether the colon is part of the query string or
the fragment, under the assumption that question marks and hash signs are only
allowed as separators of query string and fragments, respectively, what is
guarenteed for URIs (RFC 3986), but not necessarily for URLs (RFC 1738) where
question marks are allowed for usernames and passwords.

Anyhow, this constitutes a minor BC, so the fix is applied to master only.
 2015-07-01 23:48:16 +02:00
Dmitry Stogov
b4db4114c5 Cleanup (avoid reallocation) 2015-07-01 22:17:55 +03:00
Dmitry Stogov
887e5ad110 Cleanup (avoid reallocation) 2015-07-01 22:17:08 +03:00
Dmitry Stogov
d2d326a381 Cleanup (avoid reallocatios and side effects in php_strip_tags) 2015-07-01 19:04:18 +03:00
Dmitry Stogov
c47c526290 Cleanup (avoid reallocation) 2015-07-01 14:59:58 +03:00
Rasmus Lerdorf
f2249bf95a php_uname has an optional arg 2015-06-30 09:55:00 -07:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Christoph M. Becker
8b064a18c8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improved code coverage of explode function
 2015-06-29 23:55:18 +02:00
Edgar R. Sandi
1b1a86c415 Improved code coverage of explode function 2015-06-29 23:49:41 +02:00
Christoph M. Becker
e32a60dd88 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Added basic and error tests for hex2bin function
 2015-06-29 23:16:50 +02:00
Edgar R. Sandi
d2bc45f6b3 Added basic and error tests for hex2bin function 2015-06-29 23:10:50 +02:00
Anatol Belski
845b191f16 refix the negative zend_long to size_t casts 
There is no good way to fix this for 32-bit without enormously
overcomplicating the logic. Therefore switching back to the previous
code and adding the casts to ensure there are no sudden casts of
negative to size_t.
 2015-06-29 20:41:39 +02:00
Christoph M. Becker
a378322409 Merge branch 'PHP-5.6' 
* PHP-5.6:
  adding several other testing scenarios of code without coverage in stripcslashes function
 2015-06-29 19:26:01 +02:00
Edgar R. Sandi
a8d61ab7f0 adding several other testing scenarios of code without coverage in stripcslashes function 2015-06-29 19:20:23 +02:00
Christoph M. Becker
df8f3a0eaa Merge branch 'PHP-5.6' 
* PHP-5.6:
  adding another testing scenario without coverage in setlocale function
 2015-06-29 18:25:30 +02:00
Edgar R. Sandi
7acdfdc84e adding another testing scenario without coverage in setlocale function 2015-06-29 18:15:03 +02:00
Dmitry Stogov
4bd22cf1c1 Improved zend_string API (Francois Laupretre) 
Squashed commit of the following:

commit d96eab8d79
Author: Francois Laupretre <francois@tekwire.net>
Date:   Fri Jun 26 01:23:31 2015 +0200

    Use the new 'ZSTR' macros in the rest of the code.

    Does not change anything to the generated code (thanks to compat macros) but cleaner.

commit b352643910
Author: Francois Laupretre <francois@tekwire.net>
Date:   Thu Jun 25 13:45:06 2015 +0200

    Improve zend_string API

    Add missing methods
 2015-06-29 16:44:54 +03:00
Anatol Belski
c783645b99 fix more places with subtle negative zend_long to size_t cast 2015-06-29 12:15:21 +02:00
Anatol Belski
c2ac0304a9 remove useless check 
thanks Yasuo :)
 2015-06-29 12:15:20 +02:00
Anatol Belski
8ccf29eb04 remove comment 
f and l are the $start and $length, since they come from the user
land, they only can be zend_long
 2015-06-29 12:15:19 +02:00
Anatol Belski
5060060317 fix negative zend_long to size_t cast 2015-06-29 10:27:42 +02:00
Edgar R. Sandi
8271890d8d removed unreachable code in the substr_replace function 2015-06-29 10:27:41 +02:00
Stanislav Malyshev
265b73e6ff Merge branch 'PHP-5.6' 
* PHP-5.6:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()

Conflicts:
	ext/standard/mail.c
 2015-06-29 00:31:56 -07:00
Stanislav Malyshev
d7daf814b7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
 2015-06-29 00:30:55 -07:00
Anatol Belski
5e3a3461c2 fix tests 2015-06-29 09:05:56 +02:00
Stanislav Malyshev
8f2e08239f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
 2015-06-28 20:23:00 -07:00
Stanislav Malyshev
cd9c39d77c Merge branch 'pull-request/1350' into PHP-5.4 
* pull-request/1350:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
 2015-06-28 20:18:56 -07:00
Rasmus Lerdorf
01ceb0f7fa 2nd arg of sprintf is optional 2015-06-28 18:08:22 -07:00
Tjerk Meesters
3bf012a98d Feature: Enhanced array_column() to also work with object elements. 2015-06-27 07:35:44 +08:00
Rasmus Lerdorf
7ceb47477d 3rd arg to stream_set_timeout is optional 
ignore_user_abort() should take a bool not a string
 2015-06-25 10:31:37 -07:00
Xinchen Hui
fa61f921f9 Micro optimization 2015-06-24 21:42:54 +08:00
Rasmus Lerdorf
56b0d6f3a0 Wrong arginfo on assert 
(not adding types, just fixing a missing arg)
 2015-06-23 22:41:41 -04:00
Christoph M. Becker
d90763d4c6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Made bug44295-win.phpt locale independent
 2015-06-24 02:04:34 +02:00
Christoph M. Becker
c201b63873 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Made bug44295-win.phpt locale independent
 2015-06-24 01:42:22 +02:00
Christoph M. Becker
cd068b1ed6 Made bug44295-win.phpt locale independent 
Formerly it failed on non English installations.
 2015-06-24 01:41:33 +02:00
Christoph M. Becker
27e557a169 Merge branch 'master' of https://git.php.net/repository/php-src 
# By Rasmus Lerdorf (3) and others
# Via Rasmus Lerdorf
* 'master' of https://git.php.net/repository/php-src:
  Fix more proto comments
  prepare NEWS for next
  Fix more minor mistakes in the proto comments
  Avoid op_num = -1 in unfinished generator cleanup
  Fix incorrect protos
 2015-06-24 01:15:44 +02:00
Christoph M. Becker
00adcbd3e9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
 2015-06-24 00:47:18 +02:00
Christoph M. Becker
905c5f4858 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #69768 (escapeshell*() doesn't cater to !)
  bump API version to 6.8
 2015-06-24 00:32:13 +02:00