php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 06:02:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
74,222 Commits 547 Branches 1,481 Tags
e7a4cf8d7ee68ade2901c1069f2af7ff14273333
Commit Graph

74222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
e7a4cf8d7e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix buffer overrun
 2013-07-15 17:35:29 +02:00
Anatol Belski
9561e598a0 fix buffer overrun 2013-07-15 17:34:36 +02:00
Anatol Belski
904c5d7ba8 kick unused var 2013-07-15 17:23:16 +02:00
Bruno CHALOPIN
2ec7b1c388 Remove PWS (Personal Web Server) references 2013-07-15 00:38:29 -07:00
Stanislav Malyshev
68e630b72f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
 2013-07-15 00:36:35 -07:00
sasezaki
e617679c0b fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too) 2013-07-15 00:36:29 -07:00
kazusuke sasezaki
76775a3aa7 fix invalid variable name at ext/spl/internal/multipleiterator.inc 2013-07-15 00:36:19 -07:00
Stanislav Malyshev
0aadbf7578 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)

Conflicts:
	ext/mysql/php_mysql.c
 2013-07-15 00:27:57 -07:00
Veres Lajos
2c73ce4363 revert false fix 2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef typo fixes 2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef less serious compatAbility fixes 2013-07-15 00:21:39 -07:00
Veres Lajos
bb64106f64 typos (orig) 2013-07-15 00:20:49 -07:00
Veres Lajos
f23a5fbc8e revert false fix 2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f typo fixes 2013-07-15 00:18:57 -07:00
Veres Lajos
b8a2b254a1 typos (orig) 2013-07-15 00:18:32 -07:00
Veres Lajos
227556c6a2 less serious compatAbility fixes 2013-07-15 00:17:35 -07:00
Stanislav Malyshev
8c663fd4cc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #62665: add curl.cainfo to php.ini

Conflicts:
	php.ini-development
	php.ini-production
 2013-07-14 23:56:59 -07:00
Stanislav Malyshev
2bad01e61b Fix bug #62665: add curl.cainfo to php.ini 
Conflicts:

	php.ini-development
	php.ini-production
 2013-07-14 23:56:03 -07:00
Stanislav Malyshev
07ab23655a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add news for bug #65219
 2013-07-14 17:07:24 -07:00
Stanislav Malyshev
a51b50000d add news for bug #65219 2013-07-14 17:07:06 -07:00
Stanislav Malyshev
9cc9d32e6a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add built-in web server to invocation list
  Terminology: change embedded web server to built-in web server to align with cli usage
  Align -B and -E parameter names with cli usage (begin_code and end_code)
  Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
 2013-07-14 17:01:43 -07:00
Lior Kaplan
f4b9b20b35 Add built-in web server to invocation list 2013-07-14 17:00:56 -07:00
Lior Kaplan
bcef0ebc2d Terminology: change embedded web server to built-in web server to align with cli usage 2013-07-14 16:42:23 -07:00
Lior Kaplan
07501dc1a2 Align -B and -E parameter names with cli usage (begin_code and end_code) 2013-07-14 16:42:09 -07:00
Anatol Belski
6e3134610c Merge branch 'PHP-5.4' of https://github.com/php/php-src into PHP-5.4 2013-07-14 20:48:26 +02:00
Anatol Belski
168a5bb6df Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix uninitialized memory usage
 2013-07-14 20:46:19 +02:00
Anatol Belski
add0833681 fix uninitialized memory usage 2013-07-14 20:44:29 +02:00
Stanley Sufficool
67c03eac62 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
 2013-07-14 11:18:11 -07:00
Stanley Sufficool
d012bdca03 Fix Bug #65219 
DBSETLDBNAME should be called before login to set DBNAME in login record
 2013-07-14 11:16:42 -07:00
Stanley Sufficool
6e32a871a4 Merge branch 'PHP-5.3' of https://git.php.net/push/php-src into PHP-5.3 
* 'PHP-5.3' of https://git.php.net/push/php-src: (23 commits)
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  Add bison 2.6.4 to the list of supported versions
  Update git rules (5.5 is stable, 5.3 sec only)
  This will be PHP 5.3.28
  Fixed bug #63186 (compile failure on netbsd)
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  missing colon
  Backported the fix for bug #53437
  Fixed test script
  Fixed bug #64997 (Segfault while using RecursiveIteratorIterator on 64-bits systems)
  Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)
  Fixed bug #64934 Apache2 TS crash with get_browser()
  Add NEWS for PHP 5.3.26
  Fixed bug #64960 (Segfault in gc_zval_possible_root)
  fix CVE-2013-2110 - use correct formula to calculate string size
  ...
 2013-07-14 11:10:36 -07:00
Xinchen Hui
e20fc85454 Update NEWS 2013-07-14 11:56:37 +08:00
Xinchen Hui
2c4f823437 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2013-07-14 11:53:56 +08:00
Xinchen Hui
ebad5178c4 Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace). 2013-07-14 11:47:06 +08:00
Felipe Pena
eab076020d - BFN 2013-07-13 17:55:50 -03:00
Felipe Pena
efc89368dd Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
 2013-07-13 17:54:41 -03:00
Felipe Pena
0863a0d6a0 - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch 2013-07-13 17:54:31 -03:00
Stanislav Malyshev
184dea7033 fix version - not -dev anymore since 5.5.0 release 2013-07-12 17:23:22 -07:00
Felipe Pena
4bd2f755ba Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
  Fixed meta data retrieve when OID is larger than 2^31
 2013-07-12 20:23:31 -03:00
Felipe Pena
281936b295 - Fixed bug #65227 (Memory leak in gmp_cmp second parameter) 2013-07-12 20:23:00 -03:00
Yasuo Ohgaki
0ddb3d97de Fixed meta data retrieve when OID is larger than 2^31 2013-07-13 06:06:23 +09:00
Yasuo Ohgaki
bccc3e2ec0 Fixed meta data retrieve when OID is larger than 2^31 2013-07-13 06:05:18 +09:00
Yasuo Ohgaki
002f3ff4dc Inprove pg_unescape_bytea() error message 2013-07-13 06:05:17 +09:00
Stanislav Malyshev
657116f12e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix the date for 5.4.17
 2013-07-12 10:58:24 -07:00
Stanislav Malyshev
d2a83efe5b fix the date for 5.4.17 2013-07-12 10:57:59 -07:00
Stanislav Malyshev
64b11f8918 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update 5.4.17 date
 2013-07-12 10:55:37 -07:00
Stanislav Malyshev
b2fbb4cc40 update 5.4.17 date 2013-07-12 10:55:24 -07:00
Stanislav Malyshev
20e9ca5c9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update 5.4.17 date
 2013-07-12 10:53:47 -07:00
Stanislav Malyshev
5b01b0904f update 5.4.17 date 2013-07-12 10:53:23 -07:00
Anatol Belski
4f4fa32ca5 updated NEWS 2013-07-11 00:51:10 +02:00
Anatol Belski
ecf057d197 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #65226 chroot() does not get enabled
 2013-07-11 00:49:41 +02:00