clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,816 Commits 493 Branches 1,365 Tags 848 MiB
db72160e5a
Commit Graph

84816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrea Faulds
db72160e5a Merge branch 'master' into integer_semantics 
Conflicts:
	Zend/zend_operators.h
 2014-09-16 13:45:06 +01:00
Dmitry Stogov
f469dc7429 Improve opcache.fast_shutdown 2014-09-16 15:28:46 +04:00
Anatol Belski
3329d54cd9 better error messages in ZMM on Windows 2014-09-16 12:27:25 +02:00
Dmitry Stogov
13be4a5a4b emalloc() must not return NULL 2014-09-16 13:53:26 +04:00
Dmitry Stogov
ca37c02520 code optimization 2014-09-16 13:52:50 +04:00
Andrea Faulds
be88d0e5d4 Use SIZEOF_ZEND_LONG instead of SIZEOF_LONG 2014-09-16 10:24:33 +01:00
Matteo Beccati
2508ce7aef Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed freetype test on multiple environments
 2014-09-16 10:23:03 +02:00
Matteo Beccati
24ed330a22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:49 +02:00
Matteo Beccati
b8470e19e4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed freetype test on multiple environments
 2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a Fixed freetype test on multiple environments 
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)

This reverts commit 592df89027.
 2014-09-16 10:19:29 +02:00
Dmitry Stogov
f5517d16d6 ws 2014-09-16 11:56:56 +04:00
Anatol Belski
71cc3991bf cast the other way round, the sign check is already done before 2014-09-16 09:33:02 +02:00
Xinchen Hui
6d2ca4b508 it's good for gc debuging 2014-09-16 14:15:01 +08:00
Dmitry Stogov
d17487f827 We don't have to check for undefined CV if we fetch it for isset() operation 2014-09-16 09:15:47 +04:00
Nikita Popov
079409bbc2 Switch (un)mangle property name to size_t and zend_string 
Also use the _ex variants where possible.
 2014-09-16 00:31:27 +02:00
Dmitry Stogov
6991780793 Optimized FE_RESET and FE_FETCH 2014-09-16 01:34:27 +04:00
Nikita Popov
a7bfd006bd Remove always-true comparisons 2014-09-15 23:07:31 +02:00
Nikita Popov
ca43b99fc6 Update types in zend_hash 
* String lengths are size_t
 * Indexes are uint32_t
 * Flags are uint32_t
 * Booleans are zend_bool
 2014-09-15 23:07:31 +02:00
Anatol Belski
8b2f15551d fix signed/unsigned mismatch warnings 2014-09-15 19:46:33 +02:00
Anatol Belski
066d39020b fix types 2014-09-15 19:46:32 +02:00
Anatol Belski
dc37e089e3 fix signed/unsigned mismatch 2014-09-15 19:46:31 +02:00
Anatol Belski
e0ff5238c5 fix negating an unsigned 2014-09-15 19:46:30 +02:00
Anatol Belski
383a0773ff fix signed/unsigned mismatch 2014-09-15 19:46:29 +02:00
Anatol Belski
e591c78d09 revamp serialization to work with size_t for Serializable 2014-09-15 19:46:28 +02:00
Anatol Belski
0799459e76 fix signed/unsigned mismatch 2014-09-15 19:46:26 +02:00
Anatol Belski
e940fc268a fix signed/unsigned mismatch 2014-09-15 19:46:25 +02:00
Anatol Belski
ea94210e8c fix most of signed/unsigned warnings in vm def 2014-09-15 19:46:24 +02:00
Remi Collet
bfa8639219 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
 2014-09-15 13:32:37 +02:00
Remi Collet
a410067d78 NEWS 2014-09-15 13:32:13 +02:00
Remi Collet
47bc380ecf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
 2014-09-15 13:31:26 +02:00
Remi Collet
ad0b63cad4 NEWS 2014-09-15 13:31:17 +02:00
Remi Collet
8cac75969e Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache 
ProxyPass is unable to provide correct PATH_INFO
as it is not aware of file path (while SetHandler is).

As we can extract PATH_INFO from PATH_TRANSLATED,
we also need to check if present in SCRIPT_NAME
and remove it.

After applying this patch.
With mod_php
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foor/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1

With mod_proxy_fcgi + SetHandler
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foo/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1

With mod_proxy_fcgi + ProxyPass
_SERVER["REQUEST_URI"]     /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"]     /info.php
_SERVER["PATH_INFO"]       /foo/bar
_SERVER["PHP_SELF"]        /info.php/foo/bar
_SERVER["QUERY_STRING"]    q=1
 2014-09-15 13:29:55 +02:00
Anatol Belski
172ca172d1 correct fix to the natcmp_ex 
Till now the actualy length diff between the strings was under
circumstances returned. Whereby for a compare function only return
values of (1, 0, -1) make sense. Thus the old behavior isn't
present anymore, natcmp_ex now behaves as a standard compare function.
 2014-09-15 12:58:46 +02:00
Anatol Belski
836fd73cce fix signed/unsigned mismatch 2014-09-15 12:58:45 +02:00
Anatol Belski
c8ed0d81e7 fix signed/unsigned mismatch 2014-09-15 12:58:44 +02:00
Anatol Belski
4e09d782ef fix unsigned negation 2014-09-15 12:58:43 +02:00
Anatol Belski
d3622c2445 fix signed/unsigned mismatch 2014-09-15 12:58:42 +02:00
Dmitry Stogov
d10bc5c005 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix initializer struct
  fix signature
  fix type
  fix condition
 2014-09-15 14:37:59 +04:00
Dmitry Stogov
f1bf5313a2 Replaced macro with better optimized inline function 2014-09-15 14:36:55 +04:00
Anatol Belski
f595ed4b8c fix initializer struct 2014-09-15 11:30:26 +02:00
Anatol Belski
4c496a7f5b fix signature 2014-09-15 11:30:25 +02:00
Anatol Belski
e056d52acf fix type 2014-09-15 11:30:23 +02:00
Anatol Belski
140d99b467 fix condition 2014-09-15 11:30:22 +02:00
Xinchen Hui
a742393305 Merge branch 'master' of https://git.php.net/repository/php-src 2014-09-15 16:54:36 +08:00
Xinchen Hui
dfc99d93d5 Remove redundant codes 2014-09-15 16:52:33 +08:00
Anatol Belski
d65ead6471 fix type 2014-09-15 10:43:39 +02:00
Kalle Sommer Nielsen
ed55d52fa7 optimize path length retrieval 2014-09-15 10:43:38 +02:00
Anatol Belski
325bf067af Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
 2014-09-15 10:29:28 +02:00
Anatol Belski
7f0f04e606 updated NEWS 2014-09-15 10:29:00 +02:00
Anatol Belski
e8780e27fd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
 2014-09-15 10:28:22 +02:00