Commit Graph

72024 Commits

Author SHA1 Message Date
Derick Rethans
51fe5bcd09 Merge branch 'PHP-5.4' 2012-10-18 21:53:08 +01:00
Derick Rethans
4980b24025 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 21:53:04 +01:00
Derick Rethans
8f7a6c3029 - Updated to version 2012.7 (2012g) 2012-10-18 21:53:03 +01:00
Derick Rethans
c165a0b6ec Merge branch 'PHP-5.4' 2012-10-18 17:54:03 +01:00
Derick Rethans
b58d45b67f Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
	Zend/acinclude.m4
2012-10-18 17:53:55 +01:00
Derick Rethans
7aed21c557 SUpport newer bisons. 2012-10-18 17:53:21 +01:00
Xinchen Hui
33ddfbe12f Merge branch 'master' of git.php.net:php-src 2012-10-18 23:34:12 +08:00
Xinchen Hui
77d9abb6f2 Merge branch 'PHP-5.4' 2012-10-18 23:33:25 +08:00
Xinchen Hui
08a06597e6 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 23:32:48 +08:00
Xinchen Hui
0d7965f0a3 Merge the fix for #61964 to 5.3, which will fix #63304 2012-10-18 23:29:33 +08:00
Andrey Hristov
8219b02579 Merge branch 'master' of ssh://git.php.net/php-src 2012-10-18 15:15:32 +02:00
Andrey Hristov
967a1ebe51 add protection against core dumps if the underlying library returns
0x0 for some reason
2012-10-18 15:09:17 +02:00
Xinchen Hui
9714ceb92b Merge branch 'PHP-5.4' 2012-10-18 20:14:54 +08:00
Xinchen Hui
f1478bbf9d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:13:36 +08:00
Xinchen Hui
db2dc7a6a4 indent 2012-10-18 20:13:14 +08:00
Xinchen Hui
84efca62ff Merge branch 'PHP-5.4' 2012-10-18 20:12:00 +08:00
Xinchen Hui
1f8fd609b0 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 20:11:32 +08:00
Xinchen Hui
e88cdaa014 better fix for #63055 2012-10-18 20:10:35 +08:00
Xinchen Hui
4eece4c86a Merge branch 'PHP-5.4' 2012-10-18 17:35:29 +08:00
Xinchen Hui
54cef2bb6d Merge branch 'PHP-5.3' into PHP-5.4 2012-10-18 17:33:52 +08:00
Xinchen Hui
8bd5e15ff7 Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite) 2012-10-18 17:31:27 +08:00
Xinchen Hui
b77873f7d2 Merge branch 'PHP-5.4' 2012-10-18 16:33:48 +08:00
Xinchen Hui
4d509708a4 I forgot that inconsistent is only avaliable in debug mode 2012-10-18 16:33:07 +08:00
Xinchen Hui
2fee6f1ee9 Merge branch 'PHP-5.4' 2012-10-18 16:06:47 +08:00
Xinchen Hui
08b9702f8a Add comments 2012-10-18 16:06:20 +08:00
Xinchen Hui
804ab5dc48 Merge branch 'PHP-5.4' 2012-10-18 15:53:12 +08:00
Xinchen Hui
ccc519b7a9 Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
This should also fixed various segfaults which the bt looks like cored in zval_mark_grey
2012-10-18 15:49:37 +08:00
Johannes Schlüter
5414856ffb Merge branch 'master' of git.php.net:/php-src 2012-10-17 18:27:40 +02:00
Johannes Schlüter
36e60436db Merge branch 'PHP-5.4' 2012-10-17 18:27:03 +02:00
Johannes Schlüter
82fb5df380 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-17 18:26:27 +02:00
Johannes Schlüter
3899adb46f PHP 5.3.18 NEWS 2012-10-17 18:25:40 +02:00
Andrey Hristov
505836e999 fix NEWS 2012-10-17 17:56:17 +02:00
Andrey Hristov
7314ed535f Merge branch 'PHP-5.3' of ssh://git.php.net/php-src into PHP-5.3 2012-10-17 17:23:37 +02:00
Andrey Hristov
c50d732f76 fix compilation failure on 32/64bit linux systems, when libmysql is used
with ext/mysql
2012-10-17 17:22:31 +02:00
Andrey Hristov
d62702851c fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems 2012-10-17 16:35:36 +02:00
Andrey Hristov
54cbf5315c Merge branch 'master' of ssh://git.php.net/php-src 2012-10-16 15:06:22 +02:00
Andrey Hristov
b0e8fb6489 fix newly introduced segfault 2012-10-16 15:06:02 +02:00
ULF WENDEL
1fafc9b373 Merge branch 'PHP-5.4'
* PHP-5.4:
  Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:56:30 +02:00
ULF WENDEL
7aa3d0ae65 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Cover have_ssl=NO and have_ssl=DISABLED
2012-09-29 18:55:51 +02:00
ULF WENDEL
5e2222f028 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
  Fixed bug #63248 Load multiple magic files on win
2012-09-29 18:55:42 +02:00
Anatoliy Belsky
6d019deee2 Fixed bug #63248 Load multiple magic files on win
- adapt config.w32 to not to use dirent lib anymore
- prevent libmagic from opening a dir handle under win
- reimplement the dir iteration functionality with streams
2012-10-16 11:03:32 +02:00
ULF WENDEL
da541ff561 Cover have_ssl=NO and have_ssl=DISABLED 2012-09-29 18:54:54 +02:00
ULF WENDEL
c36981efdb Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (47 commits)
  Updating expected output in anticipation of mysqlnd_auth.c path
  updated NEWS
  Fixed bug #63248 Load multiple magic files on win
  Refactor to using a stack based zval instead of dynamic allocation
  Clean up unreported memory leak by switching to zval_ptr_dtor
  fix allocation and copy issue
  Really fix leaks, add test cases to prove it...
  Fix issue with possible memory leak
  Fix some double free issues, and more cleanup work
  Refactor  slightly to enable cleaner readability
  Fix arg info for required params passed to needs_rehash
  Fix ucwords error casing
  A bunch of naming convention fixes. No functionality changes
  Switch to using an ENUM for algorithms instead of a constant
  Fix incorrect arg info required param count for password_hash
  Add news entry for password API
  Expose PASSWORD_BCRYPT_DEFAULT_COST constant and update test to use it
  Remove bcrypt_cost ini entry from declaration
  Switch test to using strict comparison for crypt fallback
  Add tests for password_get_info and password_needs_rehash
  ...
2012-09-29 18:53:37 +02:00
ULF WENDEL
917639d463 Updating expected output in anticipation of mysqlnd_auth.c path 2012-09-29 17:42:00 +02:00
ULF WENDEL
0e1df4dfe7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (46 commits)
  updated NEWS
  Fixed bug #63248 Load multiple magic files on win
  Refactor to using a stack based zval instead of dynamic allocation
  Clean up unreported memory leak by switching to zval_ptr_dtor
  fix allocation and copy issue
  Really fix leaks, add test cases to prove it...
  Fix issue with possible memory leak
  Fix some double free issues, and more cleanup work
  Refactor  slightly to enable cleaner readability
  Fix arg info for required params passed to needs_rehash
  Fix ucwords error casing
  A bunch of naming convention fixes. No functionality changes
  Switch to using an ENUM for algorithms instead of a constant
  Fix incorrect arg info required param count for password_hash
  Add news entry for password API
  Expose PASSWORD_BCRYPT_DEFAULT_COST constant and update test to use it
  Remove bcrypt_cost ini entry from declaration
  Switch test to using strict comparison for crypt fallback
  Add tests for password_get_info and password_needs_rehash
  Refactoring to use size_t instead of int most places
  ...
2012-09-29 17:40:12 +02:00
Anatoliy Belsky
7eba512b51 updated NEWS 2012-10-16 11:14:43 +02:00
Anatoliy Belsky
3c89f8507f Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #63248 Load multiple magic files on win

Conflicts:
	NEWS
2012-10-16 11:14:11 +02:00
Anthony Ferrara
9aacdf6e89 Merging in Password Hashing API into master
This implements the accepted RFC password_hash https://wiki.php.net/rfc/password_hash
2012-10-16 04:11:37 -04:00
Anthony Ferrara
0bc9ca39ce Refactor to using a stack based zval instead of dynamic allocation 2012-10-07 05:42:08 -04:00
Anthony Ferrara
37b2207f66 Clean up unreported memory leak by switching to zval_ptr_dtor 2012-10-07 05:12:02 -04:00