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
84,645 Commits 491 Branches 1,363 Tags 846 MiB
610ef5d7ec
Commit Graph

84645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tjerk Meesters
610ef5d7ec Updated UPGRADING for ext/ereg removal 2014-09-11 10:22:44 +08:00
Tjerk Meesters
86de7963fe Removing ext/ereg and dependencies 
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')

SAPI:
- apache (header only)
- apache_hooks (header only)
 2014-09-11 10:22:44 +08:00
Anatol Belski
e699f654f0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:32:25 +02:00
Anatol Belski
0b89bb83ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix precision when fetching float through mysqlnd
 2014-09-10 19:31:59 +02:00
Anatol Belski
dff820cea3 fix precision when fetching float through mysqlnd 
fixes failing ext/mysqli/tests/010.phpt
 2014-09-10 19:29:11 +02:00
Michael Wallner
80ef586541 Merge branch 'PHP-5.6' 
* PHP-5.6:
  make LTP version check a blacklist
 2014-09-10 13:31:39 +02:00
Michael Wallner
4f2563329b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  make LTP version check a blacklist
 2014-09-10 13:31:22 +02:00
Michael Wallner
3b78a24ee9 make LTP version check a blacklist 2014-09-10 13:30:52 +02:00
Anatol Belski
466a4c97b2 replace zend_hash_find with zend_hash_str_find which fixes leaking the key 2014-09-10 13:22:23 +02:00
Anatol Belski
e3ded277a5 second big shot on porting ext/oci8 
still a lot to do, but most raw things done
 2014-09-10 12:41:43 +02:00
Anatol Belski
686213a242 first shot on fixing ext/oci8 2014-09-10 12:41:42 +02:00
Anatol Belski
2e085df5c0 basic datatype fixes for ext/oci8 2014-09-10 12:41:41 +02:00
Dmitry Stogov
c07a0dbcb9 Don't miss warning messages 2014-09-10 13:02:01 +04:00
Matteo Beccati
205b6b8a13 Merge branch 'PHP-5.6' 
* PHP-5.6:
  FR #67990 - Added nowait argument to sem_acquire
 2014-09-10 07:32:36 +02:00
Matteo Beccati
0b648a424f FR #67990 - Added nowait argument to sem_acquire 2014-09-10 07:31:25 +02:00
Stanislav Malyshev
5b8243014f Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
 2014-09-09 16:20:20 -07:00
Stanislav Malyshev
3571a68ab9 update NEWS 2014-09-09 16:11:32 -07:00
Daniel Lowrey
13695a5ead Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:25:36 -06:00
Daniel Lowrey
edb2799333 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 10:24:40 -06:00
Daniel Lowrey
bf2f80b223 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
 2014-09-09 09:27:20 -06:00
Daniel Lowrey
372844918a Bug #41631: Fix regression from first attempt (6569db8) 2014-09-09 09:01:42 -06:00
Daniel Lowrey
f86b2193a4 Bug #67965: Fix blocking behavior in non-blocking crypto streams 2014-09-09 07:37:57 -06:00
Tjerk Meesters
b192ff155d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #67985 - Incorrect last used array index copied to new array after unset

Conflicts:
	Zend/zend_variables.c
 2014-09-09 19:32:09 +08:00
Tjerk Meesters
da7c87e2f8 Updated NEWS for #67985 2014-09-09 18:04:09 +08:00
Tjerk Meesters
7e9daf60c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed #67985 - Incorrect last used array index copied to new array after unset
 2014-09-09 18:03:10 +08:00
Tjerk Meesters
b9ac5e23fb Updated NEWS for #67985 2014-09-09 18:02:45 +08:00
Tjerk Meesters
aca474fa14 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed #67985 - Incorrect last used array index copied to new array after unset
 2014-09-09 18:00:49 +08:00
Tjerk Meesters
99f0760bfb Fixed #67985 - Incorrect last used array index copied to new array after unset 
In master zend_array_dup() is used to do this properly; this is a workaround.
 2014-09-09 17:58:45 +08:00
Michael Wallner
a6c47caf25 Merge branch 'PHP-5.6' 
* PHP-5.6:
  duplicate value's string for the SAPI filter
  Fine tuned the order of adding request variables.
 2014-09-09 06:56:33 +02:00
Michael Wallner
8d1099ac05 duplicate value's string for the SAPI filter 
reported by sesser; tyrael, do you take care of the bug/NEWS?
 2014-09-09 06:54:23 +02:00
George Wang
2470e01ab6 Fine tuned the order of adding request variables. 2014-09-09 00:01:36 -04:00
George Wang
4bdd9aabdd Fine tuned the order of adding request variables. 2014-09-09 00:01:03 -04:00
George Wang
bdac08bcdd Fine tuned the order of adding request variables. 2014-09-09 00:00:14 -04:00
George Wang
d2e1a04b10 Fine tuned the order of adding request variables. 2014-09-08 23:58:05 -04:00
Xinchen Hui
b625661248 Remove unnecessary branch/temp variable 2014-09-09 11:52:25 +08:00
Dmitry Stogov
7edd562787 Don't anload zend extensions if ZEND_DONT_UNLOAD_MODULES environment variable is set 2014-09-09 00:50:44 +04:00
Dmitry Stogov
a9d985263a We don't need to check for xlat entry twice 2014-09-09 00:40:14 +04:00
Dmitry Stogov
c59300ac86 Fixed GC problem (arrays may be recorded as possible root of garbage cycle. we have to clear this info before deleting array) 2014-09-09 00:12:36 +04:00
Adam Harvey
d91717f458 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now
 2014-09-08 19:31:58 +00:00
Adam Harvey
0cbfdc9df5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67972 (SessionHandler Invalid memory read create_sid()).
  Update LSAPI to 6.7, added support for 'filter_input'. Fixed a crash in CLI mode.
  5.5.18 now

Conflicts:
	configure.in
	main/php_version.h
 2014-09-08 19:28:15 +00:00
Adam Harvey
bc44eb6172 Fix bug #67972 (SessionHandler Invalid memory read create_sid()). 
SessionHandler::create_sid() didn't check if PS(default_mod) was initialised
before attempting to call its create_sid() handler.
 2014-09-08 19:25:14 +00:00
Anatol Belski
9ee4a40f27 made Visual Studio to understand that zend_error_noreturn() will not return 
- windows only, on linux gcc would cause a warning that the function returns,
  as no noreturn functions are used
- ZEND_NORETURN works on windows as well now, using __declspec(noreturn),
  which is useful for the other cases
- one more function call will be needed, which is not critical for the
  error reporting
- the way is open to enable the same for gcc as soon as it's not causing a warning
 2014-09-08 20:34:26 +02:00
Dmitry Stogov
6561d03a41 Added ability to make a number of "warmup" requests before an actual benchmark. 
(php-cgi -T [<number-of-warmup-requests>,]<number-of-benchmark-requests> <file>)
 2014-09-08 16:24:46 +04:00
Nikita Popov
af84d5737c Fix parser stack destruction with dummy ENCAPSED_AND_WHITESPACE 
T_ENCAPSED_AND_WHITESPACE is now specified to always hold a value,
so give it a NULL value in the dummy cases.
 2014-09-08 13:57:28 +02:00
Dmitry Stogov
e85545eca5 Removed IS_STR_OFFSET type and corresponding macros. Optimized string offset handling in ASSIGN_DIM opcode. 2014-09-08 15:46:45 +04:00
Dmitry Stogov
be835b2d70 Fixed comments and removed useless code. 2014-09-08 11:08:05 +04:00
Anatol Belski
5661a1ba0b fix null pointer deref 2014-09-07 20:26:01 +02:00
Anatol Belski
e254ba32d5 fixed the tests, related to the basename behaviour, bug #66395 2014-09-07 20:11:49 +02:00
Anatol Belski
cfa2b3bf63 fixed string index handling with references 2014-09-07 13:34:18 +02:00
Anatol Belski
acad6f4700 fix 64 bit string index usage 2014-09-07 00:55:36 +02:00