clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,416 Commits 494 Branches 1,367 Tags 800 MiB
4d9a1883aa
Commit Graph

9459 Commits

Author SHA1 Message Date
Andrea Faulds
c3c0f531a2 Scalar type hints with ZPP casting rules 2015-02-10 15:48:04 +00:00
Dmitry Stogov
94602028f0 Get rid of old HashTable iteration API 2015-02-10 16:59:34 +03:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
Bob Weinand
fc444fbc70 Shut up, my lovely compiler; I do not like your warnings 
Conflicts:
	Zend/zend_object_handlers.c
 2015-02-09 11:23:35 +08:00
Michael Wallner
3121116a93 fix detection of mbstate_t with clang 
AC_TRY_COMPILE expexts a function body
 2015-02-08 21:46:16 +01:00
Anatol Belski
ce9f52adcd Merge branch 'PHP-5.6' 
* PHP-5.6:
  moved the part of the test into an appropriate place
 2015-02-08 14:13:39 +01:00
Anatol Belski
979020fcad moved the part of the test into an appropriate place 2015-02-08 14:10:52 +01:00
Anatol Belski
371db55871 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix another invalid free of CG(interned_empty_string)
  add tests for #68996
  Fixed #68790 (Missing return)
  Invalid free of CG(interned_empty_string)

Conflicts:
	ext/soap/soap.c
	ext/wddx/wddx.c
	main/main.c
	sapi/litespeed/lsapi_main.c
 2015-02-08 12:43:22 +01:00
manuel
cc13d8696f Fix another invalid free of CG(interned_empty_string) 
Fixes #68214
 2015-02-07 19:17:31 +01:00
manuel
3550cc5fd9 add tests for #68996 2015-02-07 18:52:26 +01:00
Anatol Belski
63761ab91e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Removed erroneous condition
 2015-02-06 09:42:41 +01:00
Anatol Belski
9ef0c39b2b Removed erroneous condition 
This condition is always false. Furthermore headers_list() is
documented to always return an array.
 2015-02-06 09:41:02 +01:00
Stanislav Malyshev
928fdbea08 fix tests 2015-02-05 21:54:47 -08:00
Stanislav Malyshev
93f0b8142b fix BC break in headers_list 2015-02-05 20:24:16 -08:00
Stanislav Malyshev
c3eac70c76 Update header handling to RFC 7230 2015-02-05 20:10:28 -08:00
Stanislav Malyshev
a1c28567c6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update header handling to RFC 7230
 2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update header handling to RFC 7230
 2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073 Update header handling to RFC 7230 2015-02-05 20:08:12 -08:00
Stanislav Malyshev
e9822e090d fix test to not hit php.net 2015-02-05 00:42:11 -08:00
Stanislav Malyshev
d33f4c6eb8 fix test to not hit php.net 2015-02-05 00:41:51 -08:00
Stanislav Malyshev
ee864f3301 fix test to not hit php.net 2015-02-05 00:11:44 -08:00
Anatol Belski
b5d3c5ca8d follow up fix for headers sent, checking a reference would be always true as well 2015-02-04 18:13:27 +01:00
Anatol Belski
1b87f31ba8 remove unused variable 2015-02-04 18:13:26 +01:00
Xinchen Hui
6fe8dce671 Merge branch 'resource-api' of https://github.com/laruence/php-src 2015-02-04 11:39:57 +08:00
Anatol Belski
55cefb2814 fix condition 
the headers member is allocated together with the SAPI globals struct
 2015-02-03 17:52:19 +01:00
Anatol Belski
fe39840450 fix incompatible pointer type warning 2015-02-03 17:52:17 +01:00
Xinchen Hui
38829b3b4b Merge branch 'master' into resource-api 2015-02-03 23:01:48 +08:00
Daniel Lowrey
37ace4ad89 Merge branch 'PHP-5.6' 
Conflicts:
	ext/standard/file.c
 2015-02-02 10:58:39 -05:00
Daniel Lowrey
f86600c167 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/standard/file.c
 2015-02-02 10:52:27 -05:00
Daniel Lowrey
f2f467bd96 Fixed bug #65272: correctly set flock() out param in windows 2015-02-02 10:47:54 -05:00
Yasuo Ohgaki
f248df9003 Cleanup trans sid code. Behavior is unchanged. 
Fixed possible injections. Escape values usually internal safe values.
 2015-02-02 17:06:16 +09:00
Xinchen Hui
e98caf27ea found type is unnecessary 2015-02-02 14:45:19 +08:00
Xinchen Hui
7ec8eb380d Use resource directly 2015-02-02 13:56:20 +08:00
Xinchen Hui
942809909e Cleanup resource handling APIs 2015-02-02 13:23:16 +08:00
Stanislav Malyshev
87d8e9208c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix TSRM

Conflicts:
	ext/standard/dns.c
 2015-01-31 23:35:11 -08:00
Stanislav Malyshev
55d5811f85 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TSRM
 2015-01-31 23:34:44 -08:00
Stanislav Malyshev
d82424b46f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TSRM
 2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78 fix TSRM 2015-01-31 23:34:14 -08:00
Stanislav Malyshev
d6b1865007 Merge branch 'pull-request/988' 
* pull-request/988:
  remove PHP4 extension structure compat
 2015-01-31 23:11:18 -08:00
Stanislav Malyshev
c408c80886 Merge branch 'pull-request/989' 
* pull-request/989:
  Fix a few tests and remove error/warning for *0
  Fix spaces -> tabs
  Add deprecated notice to invalid DES salts.
 2015-01-31 22:04:39 -08:00
Stanislav Malyshev
141b14454c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Conflicts:
	ext/sockets/sockaddr_conv.c
	ext/standard/dns.c
 2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018 Use better constant since MAXHOSTNAMELEN may mean shorter name 2015-01-31 21:46:56 -08:00
Stanislav Malyshev
41bdd6e7cc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add mitigation for CVE-2015-0235 (bug #68925)
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:12:20 -08:00
Stanislav Malyshev
882a375dba Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:04:55 -08:00
Michael Wallner
7a94243402 fix warnings 2015-01-30 22:19:23 +01:00
Xinchen Hui
4f5d010269 Fixed segfault introduced in f869bf3829 2015-01-30 22:11:21 +08:00
Nikita Popov
d133e68bab Remove support for hex number from is_numeric_string 2015-01-28 22:54:17 +01:00
Xinchen Hui
68f5eb7e71 minor CS fix 2015-01-27 20:35:25 +08:00
Márcio Almada
927ebc9789 add another test to #1022 2015-01-27 07:16:22 -03:00
Márcio Almada
f869bf3829 fix failure with shared zvals in php_str_replace_in_subject 2015-01-27 07:16:22 -03:00
Márcio Almada
1c0dcb268c add failing test for string_replace and array replaces with references 
```
make test TESTS=ext/standard/tests/strings/str_replace_*.phpt
```
 2015-01-27 07:16:22 -03:00
Bob Weinand
5845f2c0c1 Merge branch 'PHP-5.6' 
Conflicts:
	NEWS
	main/streams/filter.c
 2015-01-26 22:53:36 +01:00
Bob Weinand
666cb333f7 Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
 2015-01-26 22:51:37 +01:00
Bob Weinand
b8461eb9ac Fix call after close if multiple filters are attached 2015-01-26 22:47:35 +01:00
Keyur Govande
4c6918ec17 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599 Fix for bugs #68114 (Build fails on OS X due to undefined symbols) 
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
 2015-01-26 21:20:29 +00:00
Keyur Govande
1933b556b9 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6 Fix for bugs #68114 (Build fails on OS X due to undefined symbols) 
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
 2015-01-26 21:19:00 +00:00
Nikita Popov
e05993dfa2 Remove dl() on fpm-fcgi 2015-01-26 21:00:23 +01:00
Nikita Popov
4d3e4d3bf9 Remove assignment of new by reference 2015-01-26 21:00:22 +01:00
Xinchen Hui
a98fd7125a Fixed bug #68897 (Using variable for sort flag in array_multisort cause wrong results) 2015-01-24 22:51:37 +08:00
Márcio Almada
f27e96c2f8 remove unused var, make string.c compilation zero warnings 2015-01-24 00:26:01 -03:00
Dmitry Stogov
e427188755 Fixed memory leak 2015-01-23 21:47:26 +03:00
Reeze Xia
bdfe4d6558 Fix one more leak when wrong $needle type provide of strripos 2015-01-23 17:14:39 +08:00
Reeze Xia
d44b6e58ba Fixed memory leak of strripos() when empty needle or haystack 2015-01-23 16:53:58 +08:00
Xinchen Hui
6ae57df70b Revert "Fixed valgrind reported issue with setlocale" 
This reverts commit fa06343d7e.
 2015-01-22 16:55:20 +08:00
Xinchen Hui
fa06343d7e Fixed valgrind reported issue with setlocale 2015-01-21 12:03:19 +08:00
Anatol Belski
44cbba100a fix leaking of locale_string in TS build 
actually more like an attempt as i see the leaks on travis,
but don't repro on my boxes
 2015-01-20 20:52:44 +01:00
Stanislav Malyshev
b16fdebcf8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.38 next
  Updated NEWS
  Updated NEWS
  Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/exif/exif.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2015-01-20 10:41:59 -08:00
Stanislav Malyshev
e18ec95687 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/standard/var_unserializer.c
 2015-01-20 10:40:39 -08:00
Stanislav Malyshev
e2744c51b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	configure.in
	main/php_version.h
 2015-01-20 10:40:11 -08:00
Anatol Belski
ea8415114a fix premature freeing of BG(locale_string) 
the returned string has to be refcounted
 2015-01-20 16:54:04 +01:00
Xinchen Hui
afa666f650 Optimized range 2015-01-20 22:02:11 +08:00
Xinchen Hui
47b7d90703 NUM_KEY is useless here 2015-01-20 16:51:20 +08:00
Andrea Faulds
5c88d11243 Update remaining octal 32-bit tests 2015-01-20 05:54:13 +00:00
Xinchen Hui
c369a03407 Use zend_string in case we will optimize them 2015-01-20 10:59:28 +08:00
Xinchen Hui
020610ee40 Remove addslashes_str 2015-01-20 10:11:48 +08:00
Xinchen Hui
da7d8f45b2 Optimized php_addslashes 2015-01-19 10:46:39 -05:00
Xinchen Hui
d917484ab7 Micro optimization for array_diff 2015-01-19 08:08:35 -05:00
Xinchen Hui
ac9a1a7b0c Optimized trim for what_len == 1 2015-01-19 07:45:30 -05:00
Xinchen Hui
020b51b46e Don't use >= as sorting condition 
which could avoid breaking usage like:

usort($a, function($a, $b) { return $a > $b; })
 2015-01-19 01:36:56 -05:00
Xinchen Hui
0706032b73 Better fix 2015-01-18 21:38:25 -05:00
Xinchen Hui
f3052c5d2f Fixed bug #68852 (broken strrpos with negative offset) 2015-01-18 10:05:27 -05:00
Andrea Faulds
5f29b98051 Error on invalid octal (fixes PHPSadness #31) 
Further error checks
 2015-01-17 18:50:28 +00:00
Nikita Popov
ca11bc0325 Remove set_socket_blocking 2015-01-17 18:26:45 +01:00
Nikita Popov
a60efc5e11 Remove set_magic_quotes_runtime 
And the alias magic_quotes_runtime
 2015-01-17 18:26:45 +01:00
Nikita Popov
4c115b6b71 Remove string category support in setlocale() 2015-01-17 18:26:45 +01:00
Nikita Popov
83391b5518 Remove for #-style comments in ini files 2015-01-17 18:26:44 +01:00
Rasmus Lerdorf
ff6b4ad8c7 FAST ZPP for strtok() and nl2br() 
Looking at some template-driven code that calls these
hundreds of times per request
 2015-01-17 08:30:40 -08:00
Xinchen Hui
396e9cdb7f Optimized extract 
symbol table already be rebuilt.. no need use set_local_var
 2015-01-16 18:12:33 +08:00
Xinchen Hui
865749e7b1 Optimized array_slice 2015-01-16 17:54:50 +08:00
Xinchen Hui
22084e1478 Added test for array_unique 2015-01-16 17:12:50 +08:00
Xinchen Hui
98a2498383 Revert "Optimize array_unique to save some comparation calls" 
Unsafe optimization

This reverts commit b57dc41e07.
 2015-01-16 15:21:21 +08:00
Xinchen Hui
1c9f91e682 Revert "We could do more...." 
This reverts commit 11f615b311.
 2015-01-16 15:21:12 +08:00
Xinchen Hui
584a43d601 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-16 00:53:26 -05:00
Xinchen Hui
484216e3c6 Fixed key length 2015-01-16 00:52:54 -05:00
Xinchen Hui
4633a6f5d6 unused var 2015-01-16 12:18:59 +08:00
Xinchen Hui
e49f763482 unused variable 2015-01-16 12:16:44 +08:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Xinchen Hui
9aac41753b Save one condition 2015-01-15 18:41:25 +08:00
Xinchen Hui
11f615b311 We could do more.... 2015-01-15 04:29:01 -05:00
Xinchen Hui
e61f444268 Fixed tests on 32-bits 2015-01-15 14:23:47 +08:00
Xinchen Hui
b57dc41e07 Optimize array_unique to save some comparation calls 2015-01-15 13:57:06 +08:00
Xinchen Hui
8a0bc38535 Merge branch 'zend_sort' of https://github.com/laruence/php-src 2015-01-14 22:15:41 -05:00
Dmitry Stogov
e0155d536f Avoid string reallocation in strtr() 2015-01-14 20:58:41 +03:00
Dmitry Stogov
588e803e85 Ipmrove strtr() by maintaining a set of characters that may start a matched pattern and avoid zend_hash_find() calls for other paterns. 2015-01-14 15:04:04 +03:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Dmitry Stogov
ade7a41040 Optimized str_[i]replace to aviod reallocations and repeatable conversions to lowercase 2015-01-13 23:23:50 +03:00
Anthony Ferrara
4a2fe3d0ab Fix a few tests and remove error/warning for *0 2015-01-13 11:49:09 -05:00
Dmitry Stogov
a7ce679578 Fixed type (case sensetive/insensetive mess) 2015-01-12 22:30:55 +03:00
Dmitry Stogov
c5047d1f11 Use FAST_ZPP in few more frequently used functions 2015-01-12 19:26:12 +03:00
Dmitry Stogov
8d2a7e98db Added special optimized cases when strtr() called with zero or one search/replace pair. 2015-01-12 16:51:59 +03:00
Dmitry Stogov
b277d360e9 Fixed reference support 2015-01-12 14:43:32 +03:00
Xinchen Hui
2f1ddff2a5 Faster strrpos implementation 2015-01-12 17:24:37 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Bob Weinand
773c8b0c09 Fix missing ZVAL_DEREF() 2015-01-10 22:29:00 +01:00
Anthony Ferrara
9cc9887224 Fix spaces -> tabs 2015-01-09 11:23:06 -05:00
Anthony Ferrara
462fef794f Add deprecated notice to invalid DES salts. 
This will cause an error in the case where invalid salts are provided for other algorithms. Currently, these invalid salts will silently fall back to STD_DES which is extremely weak. By detecting invalid DES salts, we can alert the user that there is a bug in their code.

The error is currently E_DEPRECATED as this has potential to break currently working (yet insecure) code. In the future it should be changed to an E_WARNING and return *0
 2015-01-09 11:18:33 -05:00
Julien Pauli
13e290d5e9 remove PHP4 extension structure compat 2015-01-09 15:07:04 +01:00
krakjoe
b99dd1e895 Merge branch 'master' of git://git.php.net/php-src 2015-01-09 07:48:29 +00:00
krakjoe
159c331844 optimization for bug report #68679 2015-01-09 07:45:21 +00:00
Dmitry Stogov
7b4808a647 Fixed bug #68636 (setlocale no longer returns current value per category). 2015-01-09 01:41:13 +03:00
Adam Harvey
ed8ebd6ce4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Calling crypt() with a salt of *0 should always return *1.

Conflicts:
	configure.in
	main/php_version.h
 2015-01-08 19:17:53 +00:00
Adam Harvey
16b6f6c7f4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Calling crypt() with a salt of *0 should always return *1.
  5.5.22 now

Conflicts:
	configure.in
	main/php_version.h
 2015-01-08 19:16:32 +00:00
Adam Harvey
8b0f105761 Calling crypt() with a salt of *0 should always return *1. 2015-01-08 19:13:23 +00:00
Xinchen Hui
7ebdc8d70d Fixed #68692 2015-01-08 16:29:33 +08:00
Xinchen Hui
f3ea1b0b6a Fixed #68694 2015-01-08 16:28:32 +08:00
Xinchen Hui
1b4f7c3a77 Fixed #68711 2015-01-08 16:20:20 +08:00
Levi Morrison
bb7ceb046e Fix bug #55416 
Remove extra, unnecessary warning when the callback fails for
array_map, array_reduce and array_filter
 2015-01-05 17:27:25 -07:00
Anatol Belski
a26ecbd572 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix ACLs tests, make it create dir where it has to, not file
 2015-01-05 19:20:33 +01:00
Anatol Belski
4756207e7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix ACLs tests, make it create dir where it has to, not file
 2015-01-05 19:20:07 +01:00
Anatol Belski
339139f876 fix ACLs tests, make it create dir where it has to, not file 2015-01-05 19:19:24 +01:00
Anatol Belski
923394c509 fix ACLs setup for tests 2015-01-05 19:14:44 +01:00
Nikita Popov
1266515e19 Fix uses of zval_add_ref and add comment on usage 
zval_add_ref should be used as a copy ctor, after the value was
already copied.

In particular when used with hash insertions, it should be applied
to the return value of the insert function.
 2015-01-05 17:02:11 +01:00
Stanislav Malyshev
b585a3aed7 Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) 2015-01-01 16:19:05 -08:00
Dmitry Stogov
aa8ecbedcb Simplify array_splice() 2014-12-30 18:15:15 +03:00
Dmitry Stogov
c6bc209e50 Simplify array_unshift() 2014-12-30 17:04:24 +03:00
Dmitry Stogov
f9a70c50a4 Simplify array_pad() 2014-12-30 17:03:38 +03:00
Stanislav Malyshev
f2fc1bdb33 Make the code lesss suspicious (can't be really 0 but it's not obvious) 2014-12-30 00:16:21 -08:00
Stanislav Malyshev
b946621333 fix "comparing size_t to <0" warning 2014-12-28 23:46:28 -08:00
Dmitry Stogov
107ae86ca6 Introduce specialized functions to compare with integer and string, to eliminate repeatable checks on each loop iteration in in_array() function. 2014-12-27 11:11:40 +03:00
Nikita Popov
2d212b426a Drop duplicate arg from hash_get_current_key_ex 2014-12-26 21:06:18 +01:00
Xinchen Hui
31e978ff5c Fixed tests fails 2014-12-25 11:33:07 +08:00
Xinchen Hui
94d26ad4b9 Add php_string_tolower/toupper which is locale depened 2014-12-25 11:29:11 +08:00
Xinchen Hui
f26c50e320 Revert "Use zend_string_tolower in zif_strtolower" 
This reverts commit 06abeab50c.
 2014-12-25 10:41:10 +08:00
Xinchen Hui
06abeab50c Use zend_string_tolower in zif_strtolower 2014-12-24 08:16:17 -05:00
Xinchen Hui
231db90b28 Merge branch 'master' of https://git.php.net/repository/php-src 2014-12-24 07:45:25 -05:00
Dmitry Stogov
c42ac09518 Added new API function 'zend_string* zend_string_tolower(zend_string*)'. 
It simplifies code and avoids unnecessary allocation and copying if string is already in lower case.
 2014-12-24 15:04:51 +03:00
Xinchen Hui
3139ba6116 FAST_ZPP for hot functions 2014-12-23 23:07:55 -05:00
Dmitry Stogov
106b1017d4 API for fast construction of packed arrays 2014-12-23 19:08:28 +03:00
Xinchen Hui
62e2973602 Revert "Improve Hash foreach macros" 
This reverts commit 95bb0a0f7a.
 2014-12-23 03:51:06 -05:00
Xinchen Hui
95bb0a0f7a Improve Hash foreach macros 2014-12-23 00:50:39 -05:00
Dmitry Stogov
6ec5ab77df Improved trim/ltrim/rtrim functions. 
Now php_trim() operates on zend_string and returns zend_string (it may return the same zend_string).
 2014-12-23 04:29:41 +03:00
Dmitry Stogov
dedf44bacc Improved array_keys() 2014-12-23 04:29:27 +03:00
Dmitry Stogov
6a6cdecbdb Improved unserialize() 2014-12-23 02:49:33 +03:00
Xinchen Hui
b5b617674e Micro optimaztion (yeah, I know compiler supposed to do that) 2014-12-22 00:10:46 -05:00
Xinchen Hui
c24125e2f9 Micro optimization 2014-12-21 23:16:25 -05:00
Xinchen Hui
201e1b8a8d Micro optimizations 2014-12-21 22:35:25 -05:00
Xinchen Hui
0adceaa87b Merge branch 'master' of https://git.php.net/repository/php-src 2014-12-21 21:53:32 -05:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Andrea Faulds
e20cbdbe97 Unify HTTP status code maps 2014-12-21 03:12:39 +00:00
Xinchen Hui
abb98080c7 Make it inline 2014-12-20 05:17:56 -05:00
Dmitry Stogov
ffc49acabc Avoid NULL pointer dereferencing 2014-12-19 18:20:55 +03:00
Dmitry Stogov
4514ba016f Improved setlocale(). Eliminated locale comparison in ext/pcre if it's not necessary. 2014-12-19 18:00:16 +03:00
Dmitry Stogov
f7b6518d10 don't sort array with single element 2014-12-19 13:07:35 +03:00
Anatol Belski
373a7a4a75 fixed tests 2014-12-19 10:24:57 +01:00
Dmitry Stogov
dae53dfc69 Improved array_diff() function (use simple and more efficient algorithm). 2014-12-19 05:06:54 +03:00
Dmitry Stogov
989c6ecfb5 Improved chr() function. Use FAST_ZPP, use interned strings. 2014-12-19 05:05:30 +03:00
Andrea Faulds
bae46f307c Unicode Codepoint Escape Syntax 2014-12-19 00:40:59 +00:00
Anatol Belski
4acc56d5b2 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  fix unserializer patch
  move this entry to the correct version
  add missing NEWS entry
  add missing NEWS entry
  Updated or skipped certain 32-bit tests
  add NEWS entry for #68594
  5.4.37
  add more BC breaks
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
  Fix typo
  Hash value must not zero?
 2014-12-17 05:29:36 +01:00
Stanislav Malyshev
8b0deb8cd2 fix unserializer patch 2014-12-16 17:50:54 -08:00
Stanislav Malyshev
9152214c1e Merge branch 'PHP-5.6' 
* PHP-5.6:
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
 2014-12-16 10:25:03 -08:00
Stanislav Malyshev
681a1afd3f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
 2014-12-16 10:19:32 -08:00
Stanislav Malyshev
622a346302 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
 2014-12-16 10:17:07 -08:00
Stanislav Malyshev
630f9c33c2 Fix bug #68594 - Use after free vulnerability in unserialize() 2014-12-16 10:15:17 -08:00
Anatol Belski
eb629b70da free the right globals 
That's the same as in the previous commit. In the TS mode the tsrm
cache pointer might be unavailable or point to a wrong thread, so
the exact globals passed should be freed.
 2014-12-16 09:12:09 +01:00
Anatol Belski
209a7a27a5 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Revert "Removed useless local variable"
  Fix the fix for bug #55415
  add BC breaks from PHPNG RFC
  add include for definition of php_url_encode
 2014-12-16 08:04:51 +01:00
Stanislav Malyshev
d9f277bd16 Fix the fix for bug #55415 2014-12-15 11:40:48 -08:00
Stanislav Malyshev
e304c3191b add include for definition of php_url_encode 2014-12-15 11:33:27 -08:00
Anatol Belski
bd76a50019 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Removed deprecated checks
 2014-12-15 20:18:40 +01:00
Dmitry Stogov
4e48bff3ce Removed deprecated checks 2014-12-15 16:42:28 +03:00
Anatol Belski
f62ad3bc57 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  made the apache ini holders to be zend_bool
  Removed useless local variable
  Use simpler functions
  Fixed test
  small fixes to UPGRADING
  Reorder to save alignment size (of course, only for common used structs)
 2014-12-15 13:57:43 +01:00
Dmitry Stogov
381bd80a79 Fixed test 2014-12-15 12:52:50 +03:00
Anatol Belski
5ff59f986c Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Revert HTTP status codes merger
  fixed tests, bugs in status codes merger
  Fixed bug #55415 (php_info produces invalid anchor names)
  NEWS
  Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes)
  NEWS
  Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github
  NEWS
  Change is_long() to be an alias of is_integer()
  Fix indentation
  Share HTTP status codes map
 2014-12-15 07:01:29 +01:00
Andrea Faulds
7950429626 Revert HTTP status codes merger 
This reverts commits 65768edcf3, 627b350f31 and 9c18ad3ac9.
 2014-12-15 01:30:58 +00:00
Andrea Faulds
9c18ad3ac9 fixed tests, bugs in status codes merger 2014-12-14 23:41:11 +00:00
Kalle Sommer Nielsen
ad01fd8b49 Fixed bug #55415 (php_info produces invalid anchor names) 
@@ Slightly based off Johannes' patch
 2014-12-14 23:09:13 +01:00
Kalle Sommer Nielsen
d82fa2273f Implement feature request #55467 (phpinfo: PHP Variables with $ and single quotes) 2014-12-14 22:47:58 +01:00
Kalle Sommer Nielsen
6b8ed592b9 Change back to use is_int() as function instead of is_integer(), as per Jan Tvrdík's request @github 2014-12-14 22:26:16 +01:00
Kalle Sommer Nielsen
04c11f918a Change is_long() to be an alias of is_integer() 
@@ See internals: news.php.net/php.internals/79639
@@ Manual will be updated so that is_int() will be an alias of is_integer()
@@ I picked integer over int for consitentcy as we do not use str instead of string either
 2014-12-14 21:57:07 +01:00
Anatol Belski
a857f3a147 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Fix bug #67106 split main fpm config
  split fpm config to two parts. PR#903
  fix typo
  Fix undefined behaviour in strnatcmp
  Fix undefined behaviour in strnatcmp
  Fixed memory leak introduced by 73458e8f
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
 2014-12-14 19:44:24 +01:00
Anatol Belski
e112f6a04e second shot on removing TSRMLS_* 2014-12-14 14:07:59 +01:00
Andrea Faulds
51771ed238 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix undefined behaviour in strnatcmp
  update NEWS
  move the test to the right place
  Fixed bug #68545 NULL pointer dereference in unserialize.c
 2014-12-13 22:30:19 +00:00