clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
72,138 Commits 494 Branches 1,367 Tags 802 MiB
cc1caf92ea
Commit Graph

30648 Commits

Author SHA1 Message Date
Xinchen Hui
cc1caf92ea Merge branch 'PHP-5.4' 2012-10-30 11:11:22 +08:00
Xinchen Hui
3342e7276c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-30 11:10:26 +08:00
Xinchen Hui
2f1c4064f8 Fixed bug #63389 (Missing context check on libxml_set_streams_context() causes memleak) 
Simply change the expect parameter type, the valid of the resource will
be checked in using time.
 2012-10-30 11:08:14 +08:00
Derick Rethans
c511ee3d64 Merge branch 'PHP-5.4' 2012-10-27 15:19:59 +01:00
Derick Rethans
4c08ee069c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-27 15:19:55 +01:00
Derick Rethans
b5344e267a - Updated to version 2012.8 (2012h) 2012-10-27 15:19:54 +01:00
Dmitry Stogov
0716ddcdb2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #63180 (Corruption of hash tables)
  fix bug #63369

Conflicts:
	NEWS
 2012-10-26 09:49:21 -07:00
Dmitry Stogov
68b229ea73 Fixed bug #63180 (Corruption of hash tables) 2012-10-26 09:47:30 -07:00
Antony Dovgal
01dee2c4b0 fix bug #63369 
(un)serialize() leaves dangling pointers, causes crashes
 2012-10-26 16:42:21 +04:00
Antony Dovgal
f2bffdc2e4 fix bug #63369 
(un)serialize() leaves dangling pointers, causes crashes
 2012-10-26 16:41:14 +04:00
Johannes Schlüter
d21d909072 Merge branch 'PHP-5.4' 2012-10-26 14:23:22 +02:00
Johannes Schlüter
4f4d77805c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/pdo_mysql/mysql_statement.c
 2012-10-26 14:22:31 +02:00
ULF WENDEL
5d4c691e51 Merge branch 'PHP-5.4' 
* PHP-5.4:
  This won't make the test pass but now its at least one that shows no unnecessary error messages...
 2012-10-26 12:32:39 +02:00
ULF WENDEL
056ecf3201 This won't make the test pass but now its at least one that shows no unnecessary error messages... 2012-10-26 12:32:10 +02:00
John Jawed (JJ)
f68f31f121 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 16:00:02 -04:00
Anthony Ferrara
18da63e5be Merge in fix for bug 63363 (CURL silently accepts boolean true for SSL_VERIFYHOST 
Merge in a fix to raise a notice when a boolean true is passed into curl_setopt for CURLOPT_SSL_VERIFYHOST.
 2012-10-25 15:30:37 -04:00
John Jawed (JJ)
3b85d09de7 Notice if CURLOPT_SSL_VERIFYHOST is set to true 2012-10-25 12:22:23 -07:00
Anatoliy Belsky
071f217388 Merge branch 'PHP-5.4' 
* PHP-5.4:
  enabled libxpm for gd on windows
 2012-10-24 10:37:23 +02:00
Anatoliy Belsky
e3ac418309 enabled libxpm for gd on windows 2012-10-24 10:36:52 +02:00
ULF WENDEL
7c00017671 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  commented out the HHC_LOCATION line, as there are no easy to use alternatives for hhc.exe on linux. we should either run the chm build on a windows box(maybe on the replacement of oti1), or look into running it through wine see http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm for details. I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot file cannot be found.
 2012-10-23 15:14:59 +02:00
Ferenc Kovacs
240f8d06de commented out the HHC_LOCATION line, as there are no easy to use alternatives for 
hhc.exe on linux.
we should either run the chm build on a windows box(maybe on the replacement of oti1),
or look into running it through wine see
http://cweiske.de/tagebuch/Generating%20CHM%20files%20with%20Wine%20on%20a%20Linux%20server,%20and%20a%20bit%20about%20PEAR's%20PhD%20transition.htm
for details.
I also set DOT_CLEANUP to NO as the doc generation was spitting out errors regarding some dot
file cannot be found.
 2012-10-25 17:11:13 +02:00
ULF WENDEL
b8595e1d40 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix for bug #62820
 2012-10-23 15:14:45 +02:00
ULF WENDEL
0737be7e7b Fix for bug #62820 2012-10-23 15:13:57 +02:00
ULF WENDEL
848780606d Fix for bug #62820 well hidden beneath a ton of whitespace changes. Do not use this pdo factory stuff - you get a line with an error on it, use the mysql stuff in the tests 2012-10-23 14:58:16 +02:00
Anatoliy Belsky
f962260081 merged changes for bug #63297 from 5.3 2012-10-25 09:40:21 +02:00
Anatoliy Belsky
6e23cfeba4 fixed a typo in the error message 2012-10-25 09:26:44 +02:00
Anatoliy Belsky
a88379e03d Fixed bug #63297 Phar fails to write an openssl based signature 
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
 2012-10-24 13:38:44 +02:00
Anatoliy Belsky
b48e163c35 enabled libxpm for gd on windows 2012-10-24 10:26:27 +02:00
ULF WENDEL
e7fc671dc0 Deprecating undocumented function alias, related to bug #63295 2012-10-23 12:02:58 +02:00
Gustavo Lopes
e7e57aea0a Use if_nametoindex in Vista 
I missed this instance in bf19838c.
 2012-10-23 11:52:31 +02:00
Anatoliy Belsky
f734c0a7ca Merge branch 'PHP-5.4' 
* PHP-5.4:
  merged changes for bug #63297 from 5.3

Conflicts:
	NEWS
 2012-10-25 09:42:18 +02:00
Andrey Hristov
91ce3764f0 Merge branch 'master' of ssh://git.php.net/php-src 2012-10-22 14:36:16 +02:00
Andrey Hristov
27e0999843 fix crashes in newly introduced macros when normal trace is disabled but 
memory traced is enabled.
 2012-10-22 14:35:35 +02:00
Christopher Jones
0afca66958 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-10-21 22:22:07 -07:00
Christopher Jones
7d59b2264e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
 2012-10-21 22:21:46 -07:00
Christopher Jones
dbb72de6c7 Re-fixed bug #60901 (Improve "tail" syntax for AIX installation) 
The original fix broke Solaris installs of OCI8
 2012-10-21 22:17:47 -07:00
Anatoliy Belsky
8b0704618f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #63284 PCRE upgrade to 8.31
 2012-10-19 09:52:43 +02:00
Anatoliy Belsky
d2fa182f25 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63284 PCRE upgrade to 8.31
 2012-10-19 09:51:58 +02:00
Anatoliy Belsky
276c5de0d8 Fixed bug #63284 PCRE upgrade to 8.31 2012-10-19 09:49:28 +02:00
Xinchen Hui
6444eef27b Update libmagic.patch 2012-10-19 11:14:14 +08:00
Christopher Jones
25ebd50553 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
 2012-10-18 17:58:36 -07:00
Christopher Jones
85b0eda4c8 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #63307 (Unused variable in oci8.c)
  Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
 2012-10-18 17:57:19 -07:00
Christopher Jones
af14da5714 Fixed bug #63307 (Unused variable in oci8.c) 
An output section for oci_internal_debug() was setting but not using a variable
 2012-10-18 17:53:00 -07:00
Christopher Jones
79a048f76f Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3 
* 'PHP-5.3' of https://git.php.net/repository/php-src:
  - Updated to version 2012.7 (2012g)
  SUpport newer bisons.
  Merge the fix for #61964 to 5.3, which will fix #63304
  indent
  better fix for #63055
  Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
  PHP 5.3.18 NEWS
  fix NEWS
  fix compilation failure on 32/64bit linux systems, when libmysql is used  with ext/mysql
  Cover have_ssl=NO and have_ssl=DISABLED
  Minor changes for MySQL 5.6
  NEWS for 76601c4
  Fix bug #63240 on stream_get_line()
  extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
  fixed tests for gd having freetype >= 2.4.10
 2012-10-18 17:37:21 -07:00
Christopher Jones
131dd88505 Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro) 
Improve high availability for explicitly terminated connections.
 2012-10-18 17:33:51 -07:00
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
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