clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,967 Commits 491 Branches 1,363 Tags 846 MiB
1c3e1a3d28
Commit Graph

94967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Francois Laupretre
1c3e1a3d28 substr_count(): Support negative values for '$offset' and '$length' parameters. 2016-03-09 14:41:37 +01:00
Francois Laupretre
56fce8990f strpos()/stripos(): Add support for negative offsets 2016-03-09 14:41:37 +01:00
Francois Laupretre
370b7039e4 Add support for negative string offsets (syntax) 2016-03-09 14:41:37 +01:00
Anatol Belski
aa2cf3a4f2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix SKIPIF sections
 2016-03-09 14:29:03 +01:00
Anatol Belski
86229f9943 fix SKIPIF sections 2016-03-09 14:28:38 +01:00
Anatol Belski
d6aba2981c Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix directory separator
 2016-03-09 14:17:44 +01:00
Anatol Belski
a2022fd82a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix directory separator
 2016-03-09 14:17:30 +01:00
Anatol Belski
a1d1f54b42 fix directory separator 2016-03-09 14:16:29 +01:00
Xinchen Hui
f2d2e8ceb9 arena_alloc never returns NULL 2016-03-09 18:05:28 +08:00
Xinchen Hui
14fec3adf9 Suppress warnings 2016-03-09 18:01:29 +08:00
Xinchen Hui
352456ed9a Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod)
 2016-03-09 12:16:46 +08:00
Xinchen Hui
9aa73d3800 Fixed bug #71729 (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod) 2016-03-09 12:16:24 +08:00
Anatol Belski
58c82ff0b0 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix regression introduced in 5683b6fa39
 2016-03-08 13:16:46 +01:00
Anatol Belski
7a4c2fa829 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix regression introduced in 5683b6fa39
 2016-03-08 13:16:08 +01:00
Anatol Belski
8ca02bb233 fix regression introduced in 5683b6fa39 
Test extended. Basically, both iterator type and next node have
to be checked.
 2016-03-08 12:59:59 +01:00
Anatol Belski
69d3b01d9c Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix incompatible pointers on 64-bit
 2016-03-07 22:05:46 +01:00
Anatol Belski
89a4342507 fix incompatible pointers on 64-bit 2016-03-07 22:01:44 +01:00
Anatol Belski
45894d922f Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix double free and move temps into local scope
  add error check
 2016-03-07 16:40:23 +01:00
Anatol Belski
f7e81fd9f1 fix double free and move temps into local scope 2016-03-07 16:38:47 +01:00
Anatol Belski
0fccddba75 add error check 2016-03-07 16:26:01 +01:00
Nikita Popov
35b34d7235 Merge branch 'PHP-7.0' 
Conflicts:
	Zend/zend_language_scanner.c
 2016-03-06 21:39:20 +01:00
Nikita Popov
860dc17ab7 Fixed bug #71724 2016-03-06 21:38:21 +01:00
Anatol Belski
df87963b90 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix ibase connection routine
 2016-03-04 12:27:43 +01:00
Anatol Belski
be5bbe7068 fix ibase connection routine 
followup on a7028d96
 2016-03-04 12:26:25 +01:00
Anatol Belski
b360ba651d fix initializer for empty_fcall_info 2016-03-04 10:57:38 +01:00
Nikita Popov
5a0594d12d Merge branch 'PHP-7.0' 2016-03-03 23:50:51 +01:00
Tjerk Meesters
a7028d9671 Fix one zpp usage in interbase 
Also small tweak to zpp REAME
 2016-03-03 23:50:02 +01:00
Nikita Popov
7ed893712f Merge branch 'PHP-7.0' 
Conflicts:
	ext/mysqlnd/mysqlnd_priv.h
	main/php_streams.h
 2016-03-03 23:20:50 +01:00
Nikita Popov
5602f64213 Eliminate usages of _PP macros 
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).

One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.

There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
 2016-03-03 23:20:12 +01:00
Nikita Popov
6c8dd3eb04 Merge branch 'PHP-7.0' 2016-03-03 19:27:41 +01:00
Nikita Popov
3240dd93b3 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-03 19:27:35 +01:00
Christoph M. Becker
2d4ad66ff2 Fixed bug #69953 
Added support for MKCALENDAR request method in CLI web server.
 2016-03-03 19:22:38 +01:00
Nikita Popov
457aa82bd4 Merge branch 'PHP-7.0' 2016-03-03 17:30:05 +01:00
Nikita Popov
159602bd86 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-03 17:29:58 +01:00
Anton Blanchard
ccd215a517 Additional improvements to crypt() detection code 
Reformat to normalize tabs vs spaces, return 1 if crypt.h not
defined, fix C99 compliance.
 2016-03-03 17:28:34 +01:00
Nikita Popov
536b08fa18 Merge branch 'PHP-7.0' 2016-03-03 17:14:25 +01:00
Nikita Popov
5a01605b4b Merge branch 'PHP-5.6' into PHP-7.0 2016-03-03 17:14:18 +01:00
Michael Orlitzky
08fce8e2c5 ext/standard/config.m4: fix crypt() test segfaults in >=glibc-2.17. 
Starting with glibc-2.17, the crypt() function will report an EINVAL
and return NULL when the format of the "salt" parameter is
invalid. The current tests for crypt() pass its result to strcmp(),
causing segfaults when the value returned from crypt() is NULL.

This commit modifies the test programs to exit with failure when
crypt() returns NULL.

Reference: https://bugs.gentoo.org/show_bug.cgi?id=518964
 2016-03-03 17:12:57 +01:00
Nikita Popov
1ce0187659 Bump API numbers 
Otherwise can't distinguish 7.0 and 7.1. Gotta add those #if's for
the FCI change...
 2016-03-03 17:02:51 +01:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE 
Also re bug #71575.
 2016-03-03 16:50:01 +01:00
James Titcumb
c4b188871e Fix bug #71575 removing extra semicolons outside macros 2016-03-03 16:41:03 +01:00
Nikita Popov
5527c5b083 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-03 16:38:13 +01:00
Nikita Popov
a4e56194d7 Fix intermixed SKIPIF and XFAIL sections in test 2016-03-03 16:38:05 +01:00
Nikita Popov
bdd578fcbb Disable upload_2G test on travis 2016-03-03 16:35:45 +01:00
Dmitry Stogov
a9a26100b4 unpack() function accepts an additional optional argument $offset. 2016-03-03 13:49:45 +03:00
Anatol Belski
de3e033010 Merge branch 'PHP-7.0' 
* PHP-7.0:
  show correct MINFO with libpq >= 9.5.x
 2016-03-02 17:06:03 +01:00
Anatol Belski
4f0042bead Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  show correct MINFO with libpq >= 9.5.x
 2016-03-02 17:05:05 +01:00
Anatol Belski
2399c64eaf show correct MINFO with libpq >= 9.5.x 2016-03-02 17:03:20 +01:00
Dmitry Stogov
c67c166f93 Removed zend_fcall_info.symbol_table 2016-03-02 17:50:55 +03:00